diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-08-05 13:25:46 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-08-08 15:41:36 +0100 |
commit | d02c28b2219d736c9598a13fead7a03eaa3256a6 (patch) | |
tree | 31046fc91ca4f29b66f3f48c429e39a858a0dfc6 /meta/recipes-devtools | |
parent | 9160e4a37561d8ac882057450a818621bec13bed (diff) | |
download | openembedded-core-contrib-d02c28b2219d736c9598a13fead7a03eaa3256a6.tar.gz |
rust-common/rust: Improve bootstrap BUILD_SYS handling
Move the "unknown" vendor workaround used during bootstrap to a
central location so it is applied consistently to all RUST_BUILD_SYS
values rather than some subset.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r-- | meta/recipes-devtools/rust/rust.inc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/meta/recipes-devtools/rust/rust.inc b/meta/recipes-devtools/rust/rust.inc index 172cd22657..5730887411 100644 --- a/meta/recipes-devtools/rust/rust.inc +++ b/meta/recipes-devtools/rust/rust.inc @@ -23,7 +23,6 @@ CARGO_DISABLE_BITBAKE_VENDORING = "1" # We can't use RUST_BUILD_SYS here because that may be "musl" if # TCLIBC="musl". Snapshots are always -unknown-linux-gnu -SNAPSHOT_BUILD_SYS = "${RUST_BUILD_ARCH}-unknown-linux-gnu" setup_cargo_environment () { # The first step is to build bootstrap and some early stage tools, # these are build for the same target as the snapshot, e.g. @@ -31,7 +30,7 @@ setup_cargo_environment () { # Later stages are build for the native target (i.e. target.x86_64-linux) cargo_common_do_configure - printf '[target.%s]\n' "${SNAPSHOT_BUILD_SYS}" >> ${CARGO_HOME}/config + printf '[target.%s]\n' "${RUST_BUILD_SYS}" >> ${CARGO_HOME}/config printf "linker = '%s'\n" "${RUST_BUILD_CCLD}" >> ${CARGO_HOME}/config } @@ -89,7 +88,7 @@ python do_configure() { # If we don't do this rust-native will compile it's own llvm for BUILD. # [target.${BUILD_ARCH}-unknown-linux-gnu] - build_section = "target.{}".format(d.getVar('SNAPSHOT_BUILD_SYS', True)) + build_section = "target.{}".format(d.getVar('RUST_BUILD_SYS', True)) config.add_section(build_section) config.set(build_section, "llvm-config", e(llvm_config_build)) @@ -136,7 +135,7 @@ python do_configure() { # We can't use BUILD_SYS since that is something the rust snapshot knows # nothing about when trying to build some stage0 tools (like fabricate) - config.set("build", "build", e(d.getVar("SNAPSHOT_BUILD_SYS", True))) + config.set("build", "build", e(d.getVar("RUST_BUILD_SYS", True))) # [install] config.add_section("install") |