From b34d2ad567fd9070020b13e0749b9976db57cc8d Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 22 May 2025 20:52:47 -0700 Subject: meta: Add TCOVERRIDE for toolchain selection at recipe scope TCOVERRIDE is defined to toolchain- and its added to OVERRIDES that a recipe can see and it can use "toolchain-gcc" or "toolchain-clang" to set specific metadata based upon global distro toolchain policy. (From OE-Core rev: 6010f47124d9067609bbe5d9ff16193c8bf79acf) Signed-off-by: Khem Raj Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Richard Purdie --- meta/conf/bitbake.conf | 2 +- meta/conf/toolchain/clang.inc | 2 ++ meta/conf/toolchain/gcc.inc | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 52e74a6879..c515a07b6f 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -801,7 +801,7 @@ DISTRO_NAME ??= "OpenEmbedded" # And finally ':forcevariable' overrides any standard variable, with the highest priority. # This works for functions as well, they are really just variables. # -OVERRIDES = "${TARGET_OS}:${TRANSLATED_TARGET_ARCH}:pn-${PN}:layer-${FILE_LAYERNAME}:${MACHINEOVERRIDES}:${DISTROOVERRIDES}:${CLASSOVERRIDE}${LIBCOVERRIDE}:forcevariable" +OVERRIDES = "${TARGET_OS}:${TRANSLATED_TARGET_ARCH}:pn-${PN}:layer-${FILE_LAYERNAME}:${MACHINEOVERRIDES}:${DISTROOVERRIDES}:${CLASSOVERRIDE}:${TCOVERRIDE}${LIBCOVERRIDE}:forcevariable" FILE_LAYERNAME ??= "config" LIBCOVERRIDE ?= "" CLASSOVERRIDE ?= "class-target" diff --git a/meta/conf/toolchain/clang.inc b/meta/conf/toolchain/clang.inc index 2bd4a07a86..fab94f0b14 100644 --- a/meta/conf/toolchain/clang.inc +++ b/meta/conf/toolchain/clang.inc @@ -30,3 +30,5 @@ TUNE_CCARGS += "${@bb.utils.contains("DISTRO_FEATURES", "usrmerge", " --dyld-pre LDFLAGS:append:class-nativesdk:x86-64 = " -Wl,-dynamic-linker,${base_libdir}/ld-linux-x86-64.so.2" LDFLAGS:append:class-nativesdk:aarch64 = " -Wl,-dynamic-linker,${base_libdir}/ld-linux-aarch64.so.1" + +TCOVERRIDE = "toolchain-clang" diff --git a/meta/conf/toolchain/gcc.inc b/meta/conf/toolchain/gcc.inc index 36d33f5d6d..75f9abe999 100644 --- a/meta/conf/toolchain/gcc.inc +++ b/meta/conf/toolchain/gcc.inc @@ -24,3 +24,4 @@ PREFERRED_PROVIDER_virtual/nativesdk-cross-cc = "gcc-crosssdk-${SDK_SYS}" PREFERRED_PROVIDER_virtual/nativesdk-cross-c++ = "gcc-crosssdk-${SDK_SYS}" PREFERRED_PROVIDER_virtual/nativesdk-compilerlibs = "nativesdk-gcc-runtime" +TCOVERRIDE = "toolchain-gcc" -- cgit v1.2.3-54-g00ecf