getVar will expand by default, so the 'True' option is no longer required

Signed-off-by: Derek Straka <derek@asterius.io>
This commit is contained in:
Derek Straka
2016-11-30 08:22:53 -05:00
parent 85d411c81c
commit 52c0f97ff6
5 changed files with 38 additions and 38 deletions
+3 -3
View File
@@ -17,9 +17,9 @@ OVERLAP_LIBS = "\
rand \
"
def get_overlap_deps(d):
deps = d.getVar("DEPENDS", True).split()
deps = d.getVar("DEPENDS").split()
overlap_deps = []
for o in d.getVar("OVERLAP_LIBS", True).split():
for o in d.getVar("OVERLAP_LIBS").split():
l = len([o for dep in deps if (o + '-rs' in dep)])
if l > 0:
overlap_deps.append(o)
@@ -31,7 +31,7 @@ OVERLAP_DEPS = "${@get_overlap_deps(d)}"
RUSTC_PREFER_DYNAMIC = "-C prefer-dynamic"
RUSTC_FLAGS += "${RUSTC_PREFER_DYNAMIC}"
CRATE_NAME ?= "${@d.getVar('BPN', True).replace('-rs', '').replace('-', '_')}"
CRATE_NAME ?= "${@d.getVar('BPN').replace('-rs', '').replace('-', '_')}"
BINNAME ?= "${BPN}"
LIBNAME ?= "lib${CRATE_NAME}-rs"
CRATE_TYPE ?= "dylib"
+3 -3
View File
@@ -18,11 +18,11 @@ def rust_base_triple(d, thing):
Note that os is assumed to be some linux form
'''
arch = d.getVar('{}_ARCH'.format(thing), True)
arch = d.getVar('{}_ARCH'.format(thing))
# All the Yocto targets are Linux and are 'unknown'
vendor = "-unknown"
os = d.getVar('{}_OS'.format(thing), True)
libc = d.getVar('TCLIBC', True)
os = d.getVar('{}_OS'.format(thing))
libc = d.getVar('TCLIBC')
# Prefix with a dash and convert glibc -> gnu
if libc == "glibc":
+2 -2
View File
@@ -8,8 +8,8 @@ def rust_base_dep(d):
# Taken from meta/classes/base.bbclass `base_dep_prepend` and modified to
# use rust instead of gcc
deps = ""
if not d.getVar('INHIBIT_DEFAULT_RUST_DEPS', True):
if (d.getVar('HOST_SYS', True) != d.getVar('BUILD_SYS', True)):
if not d.getVar('INHIBIT_DEFAULT_RUST_DEPS'):
if (d.getVar('HOST_SYS') != d.getVar('BUILD_SYS')):
deps += " virtual/${TARGET_PREFIX}rust ${RUSTLIB_DEP}"
else:
deps += " rust-native"