diff options
Diffstat (limited to 'meta/recipes-devtools/rust/rust-common.inc')
-rw-r--r-- | meta/recipes-devtools/rust/rust-common.inc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/meta/recipes-devtools/rust/rust-common.inc b/meta/recipes-devtools/rust/rust-common.inc index ceeee97863..310aecef22 100644 --- a/meta/recipes-devtools/rust/rust-common.inc +++ b/meta/recipes-devtools/rust/rust-common.inc | |||
@@ -313,10 +313,12 @@ def rust_gen_target(d, thing, wd, features, cpu, arch, abi=""): | |||
313 | sys = sys_for(d, thing) | 313 | sys = sys_for(d, thing) |
314 | prefix = prefix_for(d, thing) | 314 | prefix = prefix_for(d, thing) |
315 | 315 | ||
316 | rust_arch = oe.rust.arch_to_rust_arch(arch) | ||
317 | |||
316 | if abi: | 318 | if abi: |
317 | arch_abi = "{}-{}".format(arch, abi) | 319 | arch_abi = "{}-{}".format(rust_arch, abi) |
318 | else: | 320 | else: |
319 | arch_abi = arch | 321 | arch_abi = rust_arch |
320 | 322 | ||
321 | features = features or d.getVarFlag('FEATURES', arch_abi) or "" | 323 | features = features or d.getVarFlag('FEATURES', arch_abi) or "" |
322 | features = features.strip() | 324 | features = features.strip() |
@@ -329,7 +331,7 @@ def rust_gen_target(d, thing, wd, features, cpu, arch, abi=""): | |||
329 | tspec['target-pointer-width'] = d.getVarFlag('TARGET_POINTER_WIDTH', arch_abi) | 331 | tspec['target-pointer-width'] = d.getVarFlag('TARGET_POINTER_WIDTH', arch_abi) |
330 | tspec['target-c-int-width'] = d.getVarFlag('TARGET_C_INT_WIDTH', arch_abi) | 332 | tspec['target-c-int-width'] = d.getVarFlag('TARGET_C_INT_WIDTH', arch_abi) |
331 | tspec['target-endian'] = d.getVarFlag('TARGET_ENDIAN', arch_abi) | 333 | tspec['target-endian'] = d.getVarFlag('TARGET_ENDIAN', arch_abi) |
332 | tspec['arch'] = arch_to_rust_target_arch(arch) | 334 | tspec['arch'] = arch_to_rust_target_arch(rust_arch) |
333 | tspec['os'] = "linux" | 335 | tspec['os'] = "linux" |
334 | if "musl" in tspec['llvm-target']: | 336 | if "musl" in tspec['llvm-target']: |
335 | tspec['env'] = "musl" | 337 | tspec['env'] = "musl" |