diff mbox series

[meta-darwin,13/21] clang: scope -femulated-tls/-Wno-elaborated-enum-base to toolchain-clang

Message ID 20261014141209.488034-13-ecordonnier@snap.com
State New
Headers show
Series [meta-darwin,01/21] meta-darwin: bump layer series to wrynose (6.0.3) | expand

Commit Message

Etienne Cordonnier Oct. 14, 2026, 2:10 p.m. UTC 
From: Etienne Cordonnier <ecordonnier@snap.com>

CFLAGS:append/CXXFLAGS:append:class-nativesdk:darwin21 applied these
clang-only flags unconditionally, even though nativesdk-clang on this
target bootstraps with GCC by default (PREFERRED_TOOLCHAIN_SDK ??=
"gcc") - the same file's own COMPILER_RT/LIBCPLUSPLUS/LDFLAGS lines
already correctly gate their clang-only bits behind :toolchain-clang,
this pair of lines just didn't. GCC rejects -femulated-tls outright,
failing CMake's compiler-works check.

AI-Generated: Claude Sonnet 5

Signed-off-by: Etienne Cordonnier <ecordonnier@snap.com>
---
 recipes-devtools/clang/clang_%.bbappend | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
diff mbox series

Patch

diff --git a/recipes-devtools/clang/clang_%.bbappend b/recipes-devtools/clang/clang_%.bbappend
index 9aa2c83..6efe32d 100644
--- a/recipes-devtools/clang/clang_%.bbappend
+++ b/recipes-devtools/clang/clang_%.bbappend
@@ -39,19 +39,18 @@  LDFLAGS:remove:toolchain-clang:class-nativesdk:x86:darwin21 = " -Wl,-dynamic-lin
 LDFLAGS:remove:toolchain-clang:class-nativesdk:aarch64:darwin21 = " -Wl,-dynamic-linker,${base_libdir}/ld-linux-aarch64.so.1"
 
 CFLAGS:append:class-nativesdk:darwin21 = " \
-    -femulated-tls \
     -I${OSXSDK}/usr/include \
     -include TargetConditionals.h \
 "
+CFLAGS:append:class-nativesdk:toolchain-clang:darwin21 = " -femulated-tls"
 
 CXXFLAGS:append:class-nativesdk:darwin21 = " \
-    -femulated-tls \
-    -Wno-elaborated-enum-base \
     -I${OSXSDK}/usr/include \
     -include TargetConditionals.h \
     -F${OSXSDK}/System/Library/Frameworks \
     -F${OSXSDK}/System/Library/Frameworks/CoreServices.framework/Frameworks \
 "
+CXXFLAGS:append:class-nativesdk:toolchain-clang:darwin21 = " -femulated-tls -Wno-elaborated-enum-base"
 
 EXTRA_OECMAKE:remove:class-nativesdk:darwin21 = "-DPYTHON_LIBRARY=${STAGING_LIBDIR}/lib${PYTHON_DIR}${PYTHON_ABI}.so"
 EXTRA_OECMAKE:remove:class-nativesdk:darwin21 = "-DPYTHON_INCLUDE_DIR=${STAGING_INCDIR}/${PYTHON_DIR}${PYTHON_ABI}"