summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/rust
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2024-06-13 09:31:52 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2024-07-01 13:58:08 +0100
commit3c1c56ec07d6f507077458faf5818ff4a88dce98 (patch)
treee6a795917e7fcbb7f57deb3878583470cf55fc26 /meta/recipes-devtools/rust
parent45aeae0075ead6f6509048857c4de213a7a302a8 (diff)
downloadpoky-3c1c56ec07d6f507077458faf5818ff4a88dce98.tar.gz
native/nativesdk: Stop overriding unprefixed *FLAGS variables
We're currently encouraging an "arms race" with the FLAGS variables since a recipe might want to set a specific flag for all variants but to do so, += won't work due to the assignment in the native/nativesdk class files. This means recipes are using append. Since the default variables are constructed out of TARGET_XXX variables and we redefine these, there is no need to re-define the un-prefixed variables. If we drop that, the += appends and similar work and recipes don't have to resort to append. Change the classes and cleanup a number of recipes to adapt to the change. This change will result in some flags appearing to some native/nativesdk variants but that is probably what was originally expected anyway. (From OE-Core rev: a157b2f9d93428ca21265cc860a3b58b3698b3aa) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/rust')
-rw-r--r--meta/recipes-devtools/rust/libstd-rs_1.75.0.bb2
-rw-r--r--meta/recipes-devtools/rust/rust_1.75.0.bb2
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-devtools/rust/libstd-rs_1.75.0.bb b/meta/recipes-devtools/rust/libstd-rs_1.75.0.bb
index d2bf266f9d..5fc6fb97bb 100644
--- a/meta/recipes-devtools/rust/libstd-rs_1.75.0.bb
+++ b/meta/recipes-devtools/rust/libstd-rs_1.75.0.bb
@@ -50,4 +50,4 @@ BBCLASSEXTEND = "nativesdk"
50# Since 1.70.0 upgrade this fails to build with gold: 50# Since 1.70.0 upgrade this fails to build with gold:
51# http://errors.yoctoproject.org/Errors/Details/708194/ 51# http://errors.yoctoproject.org/Errors/Details/708194/
52# ld: error: version script assignment of to symbol __rust_alloc_error_handler_should_panic failed: symbol not defined 52# ld: error: version script assignment of to symbol __rust_alloc_error_handler_should_panic failed: symbol not defined
53LDFLAGS:append = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd', '', d)}" 53LDFLAGS += "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', '-fuse-ld=bfd', '', d)}"
diff --git a/meta/recipes-devtools/rust/rust_1.75.0.bb b/meta/recipes-devtools/rust/rust_1.75.0.bb
index c66c14cc5a..bb10c852b4 100644
--- a/meta/recipes-devtools/rust/rust_1.75.0.bb
+++ b/meta/recipes-devtools/rust/rust_1.75.0.bb
@@ -365,4 +365,4 @@ BBCLASSEXTEND = "native nativesdk"
365# Since 1.70.0 upgrade this fails to build with gold: 365# Since 1.70.0 upgrade this fails to build with gold:
366# http://errors.yoctoproject.org/Errors/Details/708196/ 366# http://errors.yoctoproject.org/Errors/Details/708196/
367# ld: error: version script assignment of to symbol __rust_alloc_error_handler_should_panic failed: symbol not defined 367# ld: error: version script assignment of to symbol __rust_alloc_error_handler_should_panic failed: symbol not defined
368LDFLAGS:append = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd', '', d)}" 368LDFLAGS += "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', '-fuse-ld=bfd', '', d)}"