diff options
Diffstat (limited to 'poky/meta/recipes-devtools/rust/rust-cross.inc')
| -rw-r--r-- | poky/meta/recipes-devtools/rust/rust-cross.inc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/poky/meta/recipes-devtools/rust/rust-cross.inc b/poky/meta/recipes-devtools/rust/rust-cross.inc index bee7c9f12f..bb625f4240 100644 --- a/poky/meta/recipes-devtools/rust/rust-cross.inc +++ b/poky/meta/recipes-devtools/rust/rust-cross.inc @@ -11,13 +11,15 @@ python do_rust_gen_targets () { features = "" cpu = "generic" arch = d.getVar('{}_ARCH'.format(thing)) + abi = "" if thing is "TARGET": + abi = d.getVar('ABIEXTENSION') # arm and armv7 have different targets in llvm if arch == "arm" and target_is_armv7(d): arch = 'armv7' features = d.getVar('TARGET_LLVM_FEATURES') or "" cpu = d.getVar('TARGET_LLVM_CPU') - rust_gen_target(d, thing, wd, features, cpu, arch) + rust_gen_target(d, thing, wd, features, cpu, arch, abi) } # Otherwise we'll depend on what we provide @@ -32,7 +34,7 @@ DEPENDS += "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}compilerlibs vir DEPENDS += "rust-native" PROVIDES = "virtual/${TARGET_PREFIX}rust" -PN = "rust-cross-${TARGET_ARCH}" +PN = "rust-cross-${TARGET_ARCH}-${TCLIBC}" # In the cross compilation case, rustc doesn't seem to get the rpath quite # right. It manages to include '../../lib/${TARGET_PREFIX}', but doesn't |