mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-30 00:20:08 +00:00
Code Issues Projects Releases Wiki Activity

rust: Remove unneeded RUST_TARGETGENS settings

Browse Source 
These match the default from the class so drop them. We then always
generate all targets so remove the configuration from the class.

(From OE-Core rev: e4d56256936c55bab2bf2934ccbde9157ef7dc57)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
2022-08-10 21:46:19 +01:00
parent 883aea9b6e
commit 83e7f668ae
4 changed files with 2 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/classes/rust-target-config.bbclass
+2 -6
View File
@@ -372,16 +372,12 @@ do_rust_gen_targets[vardeps] += "DATA_LAYOUT TARGET_ENDIAN TARGET_POINTER_WIDTH
RUST_TARGETS_DIR = "${WORKDIR}/rust-targets/" RUST_TARGETS_DIR = "${WORKDIR}/rust-targets/"
export RUST_TARGET_PATH = "${RUST_TARGETS_DIR}" export RUST_TARGET_PATH = "${RUST_TARGETS_DIR}"
RUST_TARGETGENS = "BUILD HOST TARGET"
python do_rust_gen_targets () { python do_rust_gen_targets () {
wd = d.getVar('RUST_TARGETS_DIR') wd = d.getVar('RUST_TARGETS_DIR')
# Order of BUILD, HOST, TARGET is important in case the files overwrite, most specific last # Order of BUILD, HOST, TARGET is important in case the files overwrite, most specific last
rust_gen_target(d, 'BUILD', wd, d.getVar('BUILD_ARCH')) rust_gen_target(d, 'BUILD', wd, d.getVar('BUILD_ARCH'))
if "HOST" in d.getVar("RUST_TARGETGENS"): rust_gen_target(d, 'HOST', wd, d.getVar('HOST_ARCH'))
rust_gen_target(d, 'HOST', wd, d.getVar('HOST_ARCH')) rust_gen_target(d, 'TARGET', wd, d.getVar('TARGET_ARCH'))
if "TARGET" in d.getVar("RUST_TARGETGENS"):
rust_gen_target(d, 'TARGET', wd, d.getVar('TARGET_ARCH'))
} }
addtask rust_gen_targets after do_patch before do_compile addtask rust_gen_targets after do_patch before do_compile
meta/recipes-devtools/cargo/cargo.inc
-2
View File
@@ -18,8 +18,6 @@ EXCLUDE_FROM_WORLD = "1"
inherit cargo pkgconfig inherit cargo pkgconfig
RUST_TARGETGENS = "BUILD HOST TARGET"
do_cargo_setup_snapshot () { do_cargo_setup_snapshot () {
${WORKDIR}/rust-snapshot-components/${CARGO_SNAPSHOT}/install.sh --prefix="${WORKDIR}/${CARGO_SNAPSHOT}" --disable-ldconfig ${WORKDIR}/rust-snapshot-components/${CARGO_SNAPSHOT}/install.sh --prefix="${WORKDIR}/${CARGO_SNAPSHOT}" --disable-ldconfig
# Need to use uninative's loader if enabled/present since the library paths # Need to use uninative's loader if enabled/present since the library paths
meta/recipes-devtools/rust/libstd-rs.inc
-3
View File
@@ -12,9 +12,6 @@ DEPENDS:append:libc-musl = " libunwind"
DEPENDS:remove:riscv32 = "libunwind" DEPENDS:remove:riscv32 = "libunwind"
DEPENDS:remove:riscv64 = "libunwind" DEPENDS:remove:riscv64 = "libunwind"
RUST_TARGETGENS = "BUILD HOST TARGET"
# Embed bitcode in order to allow compiling both with and without LTO # Embed bitcode in order to allow compiling both with and without LTO
RUSTFLAGS += "-Cembed-bitcode=yes" RUSTFLAGS += "-Cembed-bitcode=yes"
# Needed so cargo can find libbacktrace # Needed so cargo can find libbacktrace
meta/recipes-devtools/rust/rust.inc
-2
View File
@@ -34,8 +34,6 @@ setup_cargo_environment () {
inherit rust-target-config inherit rust-target-config
RUST_TARGETGENS = "BUILD HOST TARGET"
do_rust_setup_snapshot () { do_rust_setup_snapshot () {
for installer in "${WORKDIR}/rust-snapshot-components/"*"/install.sh"; do for installer in "${WORKDIR}/rust-snapshot-components/"*"/install.sh"; do
"${installer}" --prefix="${WORKDIR}/rust-snapshot" --disable-ldconfig "${installer}" --prefix="${WORKDIR}/rust-snapshot" --disable-ldconfig