mirrors/meta-rust
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

library resolution sucks

Browse Source
This commit is contained in:
Cody P Schafer
2014-11-20 03:39:40 -05:00
parent 4b198fb3a4
commit 72783dba50
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
recipes/rust/rust.inc
+8 -6
View File
@@ -58,16 +58,18 @@ HOST_CPPFLAGS ??= "${CPPFLAGS}"
# users of these variables without any backtrace or error message other than # users of these variables without any backtrace or error message other than
# "failed" (of some form or another). Probably an issue with bitbake attempting # "failed" (of some form or another). Probably an issue with bitbake attempting
# to track variable users and us having too many dynamic variable names. # to track variable users and us having too many dynamic variable names.
TARGET_PRE_LINK_ARGS = "${TARGET_CC_ARCH} ${TOOLCHAIN_OPTIONS} ${PRE_LINK_ARGS[${TARGET_ARCH}]}" # enable-new-dtags causes rpaths to be inserted as DT_RUNPATH (as well as
BUILD_PRE_LINK_ARGS = "${BUILD_CC_ARCH} ${TOOLCHAIN_OPTIONS} ${PRE_LINK_ARGS[${BUILD_ARCH}]}" # DT_RPATH), which lets LD_LIBRARY_PATH override them
HOST_PRE_LINK_ARGS = "${HOST_CC_ARCH} ${TOOLCHAIN_OPTIONS} ${PRE_LINK_ARGS[${HOST_ARCH}]}" TARGET_PRE_LINK_ARGS = "-Wl,--enable-new-dtags ${TARGET_CC_ARCH} ${TOOLCHAIN_OPTIONS} ${PRE_LINK_ARGS[${TARGET_ARCH}]}"
BUILD_PRE_LINK_ARGS = "-Wl,--enable-new-dtags ${BUILD_CC_ARCH} ${TOOLCHAIN_OPTIONS} ${PRE_LINK_ARGS[${BUILD_ARCH}]}"
HOST_PRE_LINK_ARGS = "-Wl,--enable-new-dtags ${HOST_CC_ARCH} ${TOOLCHAIN_OPTIONS} ${PRE_LINK_ARGS[${HOST_ARCH}]}"
# These LDFLAGS have '-L' options in them. We need these to come last so they # These LDFLAGS have '-L' options in them. We need these to come last so they
# don't screw up the link order and pull in the wrong rust build/version. # don't screw up the link order and pull in the wrong rust build/version.
# TODO: may want to strip out all the '-L' flags entirely here # TODO: may want to strip out all the '-L' flags entirely here
TARGET_POST_LINK_ARGS = "${TARGET_LDFLAGS}" #TARGET_POST_LINK_ARGS = "${TARGET_LDFLAGS}"
BUILD_POST_LINK_ARGS = "${BUILD_LDFLAGS}" #BUILD_POST_LINK_ARGS = "${BUILD_LDFLAGS}"
HOST_POST_LINK_ARGS = "${HOST_LDFLAGS}" #HOST_POST_LINK_ARGS = "${HOST_LDFLAGS}"
def arch_for(d, thing): def arch_for(d, thing):
return d.getVar('{}_ARCH'.format(thing), True) return d.getVar('{}_ARCH'.format(thing), True)