From: Ross Burton <ross.burton@arm.com>
Date: Mon, 29 Sep 2025 17:11:23 +0000 (+0100)
Subject: clang: use EXTRA_OECMAKE +=
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5ad8d6ddf7a1ada37ad1070a3d3347c7f6d57148;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

clang: use EXTRA_OECMAKE +=

Don't assign EXTRA_OECMAKE so that the include files can set defaults.

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
---

diff --git a/meta/recipes-devtools/clang/libclc_git.bb b/meta/recipes-devtools/clang/libclc_git.bb
index e56cf2eb6c..60909339e7 100644
--- a/meta/recipes-devtools/clang/libclc_git.bb
+++ b/meta/recipes-devtools/clang/libclc_git.bb
@@ -21,7 +21,7 @@ B_NATIVE = "${B}-native"
 # Semicolon-separated list of targets to build
 LIBCLC_TARGETS ?= "all"
 
-EXTRA_OECMAKE = "-DLIBCLC_TARGETS_TO_BUILD=${LIBCLC_TARGETS}"
+EXTRA_OECMAKE += "-DLIBCLC_TARGETS_TO_BUILD=${LIBCLC_TARGETS}"
 EXTRA_OECMAKE:append:class-target = " -DPREPARE_BUILTINS=${B_NATIVE}/prepare_builtins"
 EXTRA_OECMAKE:append:class-nativesdk = " -DPREPARE_BUILTINS=${B_NATIVE}/prepare_builtins"
 
diff --git a/meta/recipes-devtools/clang/lld_git.bb b/meta/recipes-devtools/clang/lld_git.bb
index 02006e0edc..b0261ad2cb 100644
--- a/meta/recipes-devtools/clang/lld_git.bb
+++ b/meta/recipes-devtools/clang/lld_git.bb
@@ -19,8 +19,8 @@ OECMAKE_SOURCEPATH = "${S}/lld"
 #
 # Explicitly enable symlinks as the lld build doesn't call into the llvm setup
 # and turn that on.
-EXTRA_OECMAKE = "-DCMAKE_SKIP_BUILD_RPATH=ON \
-                 -DLLVM_INCLUDE_TESTS=OFF -DLLVM_USE_SYMLINKS=ON \
-                 -DLLVM_TABLEGEN_EXE=${STAGING_BINDIR_NATIVE}/llvm-tblgen"
+EXTRA_OECMAKE += "-DCMAKE_SKIP_BUILD_RPATH=ON \
+                  -DLLVM_INCLUDE_TESTS=OFF -DLLVM_USE_SYMLINKS=ON \
+                  -DLLVM_TABLEGEN_EXE=${STAGING_BINDIR_NATIVE}/llvm-tblgen"
 
 BBCLASSEXTEND = "native nativesdk"
diff --git a/meta/recipes-devtools/clang/lldb_git.bb b/meta/recipes-devtools/clang/lldb_git.bb
index eafc3cb312..ecab8c09a7 100644
--- a/meta/recipes-devtools/clang/lldb_git.bb
+++ b/meta/recipes-devtools/clang/lldb_git.bb
@@ -16,15 +16,15 @@ DEPENDS = "llvm-tblgen-native clang"
 
 OECMAKE_SOURCEPATH = "${S}/lldb"
 
-EXTRA_OECMAKE = "-DLLDB_INCLUDE_TESTS=OFF \
-                 -DLLDB_ENABLE_LUA=OFF \
-                 -DLLDB_PYTHON_RELATIVE_PATH=${PYTHON_SITEPACKAGES_DIR} \
-                 -DLLDB_PYTHON_EXE_RELATIVE_PATH=${PYTHON_PN} \
-                 -DLLDB_PYTHON_EXT_SUFFIX=${SOLIBSDEV} \
-                 -DLLVM_DIR=${STAGING_LIBDIR}/cmake/llvm/ \
-                 -DLLVM_TABLEGEN=${STAGING_BINDIR_NATIVE}/llvm-tblgen \
-                 -DLLDB_TABLEGEN_EXE=${STAGING_BINDIR_NATIVE}/lldb-tblgen \
-                 -DLLDB_NO_INSTALL_DEFAULT_RPATH=ON \
+EXTRA_OECMAKE += "-DLLDB_INCLUDE_TESTS=OFF \
+                  -DLLDB_ENABLE_LUA=OFF \
+                  -DLLDB_PYTHON_RELATIVE_PATH=${PYTHON_SITEPACKAGES_DIR} \
+                  -DLLDB_PYTHON_EXE_RELATIVE_PATH=${PYTHON_PN} \
+                  -DLLDB_PYTHON_EXT_SUFFIX=${SOLIBSDEV} \
+                  -DLLVM_DIR=${STAGING_LIBDIR}/cmake/llvm/ \
+                  -DLLVM_TABLEGEN=${STAGING_BINDIR_NATIVE}/llvm-tblgen \
+                  -DLLDB_TABLEGEN_EXE=${STAGING_BINDIR_NATIVE}/lldb-tblgen \
+                  -DLLDB_NO_INSTALL_DEFAULT_RPATH=ON \
 "
 
 PACKAGECONFIG ??= "libedit libxml2 lzma"