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

Expantion of flags via variables does not seem to work, use python to grab them

Browse Source
This commit is contained in:
Cody P Schafer
2014-11-20 04:21:34 -05:00
parent 72783dba50
commit 7d7ba2904c
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
recipes/rust/rust.inc
+11 -6
View File
@@ -60,9 +60,9 @@ HOST_CPPFLAGS ??= "${CPPFLAGS}"
# to track variable users and us having too many dynamic variable names. # to track variable users and us having too many dynamic variable names.
# enable-new-dtags causes rpaths to be inserted as DT_RUNPATH (as well as # enable-new-dtags causes rpaths to be inserted as DT_RUNPATH (as well as
# DT_RPATH), which lets LD_LIBRARY_PATH override them # DT_RPATH), which lets LD_LIBRARY_PATH override them
TARGET_PRE_LINK_ARGS = "-Wl,--enable-new-dtags ${TARGET_CC_ARCH} ${TOOLCHAIN_OPTIONS} ${PRE_LINK_ARGS[${TARGET_ARCH}]}" TARGET_PRE_LINK_ARGS = "-Wl,--enable-new-dtags ${TARGET_CC_ARCH} ${TOOLCHAIN_OPTIONS}"
BUILD_PRE_LINK_ARGS = "-Wl,--enable-new-dtags ${BUILD_CC_ARCH} ${TOOLCHAIN_OPTIONS} ${PRE_LINK_ARGS[${BUILD_ARCH}]}" BUILD_PRE_LINK_ARGS = "-Wl,--enable-new-dtags ${BUILD_CC_ARCH} ${TOOLCHAIN_OPTIONS}"
HOST_PRE_LINK_ARGS = "-Wl,--enable-new-dtags ${HOST_CC_ARCH} ${TOOLCHAIN_OPTIONS} ${PRE_LINK_ARGS[${HOST_ARCH}]}" HOST_PRE_LINK_ARGS = "-Wl,--enable-new-dtags ${HOST_CC_ARCH} ${TOOLCHAIN_OPTIONS}"
# 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.
@@ -115,9 +115,15 @@ def as_json(list_):
a += ']' a += ']'
return a return a
def ldflags_for(d, thing):
ldflags = (d.getVar('{}_PRE_LINK_ARGS'.format(thing), True) or "").split()
ldflags.extend((d.getVarFlag('PRE_LINK_ARGS', arch, True) or "").split())
return ldflags
def rust_gen_target(d, thing, wd): def rust_gen_target(d, thing, wd):
arch = arch_for(d, thing) arch = arch_for(d, thing)
ldflags = d.getVar('{}_PRE_LINK_ARGS'.format(thing), True).split() ldflags = ldflags_for(d, thing)
sys = sys_for(d, thing) sys = sys_for(d, thing)
prefix = prefix_for(d, thing) prefix = prefix_for(d, thing)
o = open(wd + sys + '.json', 'w') o = open(wd + sys + '.json', 'w')
@@ -132,8 +138,7 @@ def rust_gen_target(d, thing, wd):
linker = "{}{}gcc".format(ccache, prefix) linker = "{}{}gcc".format(ccache, prefix)
features = d.getVarFlag('FEATURES', arch, True) or "" features = d.getVarFlag('FEATURES', arch, True) or ""
pre_link_args = (d.getVar('{}_PRE_LINK_ARGS'.format(thing), True) or "").split() pre_link_args = ldflags
pre_link_args.extend((d.getVarFlag('PRE_LINK_ARGS', arch, True) or "").split())
post_link_args = (d.getVar('{}_POST_LINK_ARGS'.format(thing), True) or "").split() post_link_args = (d.getVar('{}_POST_LINK_ARGS'.format(thing), True) or "").split()
post_link_args.extend((d.getVarFlag('POST_LINK_ARGS', arch, True) or "").split()) post_link_args.extend((d.getVarFlag('POST_LINK_ARGS', arch, True) or "").split())