From d02c28b2219d736c9598a13fead7a03eaa3256a6 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 5 Aug 2022 13:25:46 +0100 Subject: [PATCH] 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 --- meta/classes/rust-common.bbclass | 5 +++++ meta/recipes-devtools/rust/rust.inc | 7 +++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/meta/classes/rust-common.bbclass b/meta/classes/rust-common.bbclass index adcf96f0cd9..f2e99493fef 100644 --- a/meta/classes/rust-common.bbclass +++ b/meta/classes/rust-common.bbclass @@ -68,6 +68,11 @@ def rust_base_triple(d, thing): else: arch = oe.rust.arch_to_rust_arch(d.getVar('{}_ARCH'.format(thing))) + # When bootstrapping rust-native, BUILD must be the same as upstream snapshot tarballs + bpn = d.getVar('BPN') + if thing == "BUILD" and bpn in ["rust"]: + return arch + "-unknown-linux-gnu" + # All the Yocto targets are Linux and are 'unknown' vendor = "-unknown" os = d.getVar('{}_OS'.format(thing)) diff --git a/meta/recipes-devtools/rust/rust.inc b/meta/recipes-devtools/rust/rust.inc index 172cd22657d..5730887411a 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") -- 2.47.2