diff mbox series

[2/3] nativesdk: don't unset MACHINE_FEATURES, let machine-sdk/ set it

Message ID 20231221170159.1995650-2-ross.burton@arm.com
State Accepted, archived
Commit 14571764b7e046507f81bbe589a9f42c5b16665a
Headers show
Series [1/3] nativesdk: ensure features don't get backfilled | expand

Commit Message

Ross Burton Dec. 21, 2023, 5:01 p.m. UTC 
From: Ross Burton <ross.burton@arm.com>

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>
---
 meta/classes-recipe/nativesdk.bbclass | 2 +-
 meta/conf/bitbake.conf                | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)
diff mbox series

Patch

diff --git a/meta/classes-recipe/nativesdk.bbclass b/meta/classes-recipe/nativesdk.bbclass
index ccaf411f0d7..de6debda93c 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 83b12cbc158..ebfd297430a 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -892,6 +892,8 @@  OES_BITBAKE_CONF = "1"
 ##################################################################
 
 MACHINE_FEATURES ?= ""
+SDK_MACHINE_FEATURES ?= ""
+
 DISTRO_FEATURES ?= ""
 
 DISTRO_EXTRA_RDEPENDS ?= ""