summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@arm.com>2023-12-21 17:01:58 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-12-23 08:43:38 +0000
commit14571764b7e046507f81bbe589a9f42c5b16665a (patch)
tree12d61d8b661fcddcd8e2e44ecf91a61179506b93 /meta
parentf560ac0a5ccced02b84df337f0f26209cd4b6474 (diff)
downloadopenembedded-core-14571764b7e046507f81bbe589a9f42c5b16665a.tar.gz
nativesdk: don't unset MACHINE_FEATURES, let machine-sdk/ set it
There is actually a use for nativesdk MACHINE_FEATURES; for example qemu-usermode being supported, as this is needed to build profile-guided optimised code. We shouldn't use the target MACHINE_FEATURES for this because the target and the SDK can be entirely different, so instead set the MACHINE_FEATURES in nativesdk.bbclass to SDK_MACHINE_FEATURES (which defaults to "") and let the conf/machine-sdk/*.conf files set that as appropriate. Signed-off-by: Ross Burton <ross.burton@arm.com> Link: https://lore.kernel.org/r/20231221170159.1995650-2-ross.burton@arm.com Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes-recipe/nativesdk.bbclass2
-rw-r--r--meta/conf/bitbake.conf2
2 files changed, 3 insertions, 1 deletions
diff --git a/meta/classes-recipe/nativesdk.bbclass b/meta/classes-recipe/nativesdk.bbclass
index ccaf411f0d..de6debda93 100644
--- a/meta/classes-recipe/nativesdk.bbclass
+++ b/meta/classes-recipe/nativesdk.bbclass
@@ -16,7 +16,7 @@ LIBCOVERRIDE = ":${NATIVESDKLIBC}"
CLASSOVERRIDE = "class-nativesdk"
MACHINEOVERRIDES = ""
-MACHINE_FEATURES = ""
+MACHINE_FEATURES = "${SDK_MACHINE_FEATURES}"
DISTRO_FEATURES_BACKFILL = ""
MACHINE_FEATURES_BACKFILL = ""
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index b3f1f18a0d..95d4bd95c8 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -896,6 +896,8 @@ OES_BITBAKE_CONF = "1"
##################################################################
MACHINE_FEATURES ?= ""
+SDK_MACHINE_FEATURES ?= ""
+
DISTRO_FEATURES ?= ""
DISTRO_EXTRA_RDEPENDS ?= ""