diff options
| author | Alexander Kanavin <alex.kanavin@gmail.com> | 2021-10-10 21:10:08 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-10-14 11:48:45 +0100 |
| commit | d6b563710e6cc0857843433d85023d47f9f2037d (patch) | |
| tree | c80b1492f65f5d562fb4d76cb07678ac253f1e77 /meta/recipes-devtools/rust/rust-cross.inc | |
| parent | 463bcb876eef2a7faf50916e921b0d8ea0daefa5 (diff) | |
| download | poky-d6b563710e6cc0857843433d85023d47f9f2037d.tar.gz | |
rust: generate target definitions from (arch, abi), not just arch
This allows to add the missing x32 definition and others in the future.
(From OE-Core rev: 79bd6389585327820dfc1a1d29f60779ef08b2e0)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/rust/rust-cross.inc')
| -rw-r--r-- | meta/recipes-devtools/rust/rust-cross.inc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/meta/recipes-devtools/rust/rust-cross.inc b/meta/recipes-devtools/rust/rust-cross.inc index bee7c9f12f..42163f7b81 100644 --- a/meta/recipes-devtools/rust/rust-cross.inc +++ b/meta/recipes-devtools/rust/rust-cross.inc | |||
| @@ -11,13 +11,15 @@ python do_rust_gen_targets () { | |||
| 11 | features = "" | 11 | features = "" |
| 12 | cpu = "generic" | 12 | cpu = "generic" |
| 13 | arch = d.getVar('{}_ARCH'.format(thing)) | 13 | arch = d.getVar('{}_ARCH'.format(thing)) |
| 14 | abi = "" | ||
| 14 | if thing is "TARGET": | 15 | if thing is "TARGET": |
| 16 | abi = d.getVar('ABIEXTENSION') | ||
| 15 | # arm and armv7 have different targets in llvm | 17 | # arm and armv7 have different targets in llvm |
| 16 | if arch == "arm" and target_is_armv7(d): | 18 | if arch == "arm" and target_is_armv7(d): |
| 17 | arch = 'armv7' | 19 | arch = 'armv7' |
| 18 | features = d.getVar('TARGET_LLVM_FEATURES') or "" | 20 | features = d.getVar('TARGET_LLVM_FEATURES') or "" |
| 19 | cpu = d.getVar('TARGET_LLVM_CPU') | 21 | cpu = d.getVar('TARGET_LLVM_CPU') |
| 20 | rust_gen_target(d, thing, wd, features, cpu, arch) | 22 | rust_gen_target(d, thing, wd, features, cpu, arch, abi) |
| 21 | } | 23 | } |
| 22 | 24 | ||
| 23 | # Otherwise we'll depend on what we provide | 25 | # Otherwise we'll depend on what we provide |
