diff options
author | Ross Burton <ross.burton@arm.com> | 2025-09-29 18:11:23 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2025-10-02 11:28:03 +0100 |
commit | 9ece218efa2ae4920f18fe663bbadda18901b14e (patch) | |
tree | 29c197e660939b66780e04b1146f6631e558cc77 | |
parent | f5fdf6ed3f2a7b1b086d2e41b855d03e76e3b4d7 (diff) | |
download | poky-9ece218efa2ae4920f18fe663bbadda18901b14e.tar.gz |
clang: use EXTRA_OECMAKE +=
Don't assign EXTRA_OECMAKE so that the include files can set defaults.
(From OE-Core rev: 5ad8d6ddf7a1ada37ad1070a3d3347c7f6d57148)
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-devtools/clang/libclc_git.bb | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/clang/lld_git.bb | 6 | ||||
-rw-r--r-- | meta/recipes-devtools/clang/lldb_git.bb | 18 |
3 files changed, 13 insertions, 13 deletions
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" | |||
21 | # Semicolon-separated list of targets to build | 21 | # Semicolon-separated list of targets to build |
22 | LIBCLC_TARGETS ?= "all" | 22 | LIBCLC_TARGETS ?= "all" |
23 | 23 | ||
24 | EXTRA_OECMAKE = "-DLIBCLC_TARGETS_TO_BUILD=${LIBCLC_TARGETS}" | 24 | EXTRA_OECMAKE += "-DLIBCLC_TARGETS_TO_BUILD=${LIBCLC_TARGETS}" |
25 | EXTRA_OECMAKE:append:class-target = " -DPREPARE_BUILTINS=${B_NATIVE}/prepare_builtins" | 25 | EXTRA_OECMAKE:append:class-target = " -DPREPARE_BUILTINS=${B_NATIVE}/prepare_builtins" |
26 | EXTRA_OECMAKE:append:class-nativesdk = " -DPREPARE_BUILTINS=${B_NATIVE}/prepare_builtins" | 26 | EXTRA_OECMAKE:append:class-nativesdk = " -DPREPARE_BUILTINS=${B_NATIVE}/prepare_builtins" |
27 | 27 | ||
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" | |||
19 | # | 19 | # |
20 | # Explicitly enable symlinks as the lld build doesn't call into the llvm setup | 20 | # Explicitly enable symlinks as the lld build doesn't call into the llvm setup |
21 | # and turn that on. | 21 | # and turn that on. |
22 | EXTRA_OECMAKE = "-DCMAKE_SKIP_BUILD_RPATH=ON \ | 22 | EXTRA_OECMAKE += "-DCMAKE_SKIP_BUILD_RPATH=ON \ |
23 | -DLLVM_INCLUDE_TESTS=OFF -DLLVM_USE_SYMLINKS=ON \ | 23 | -DLLVM_INCLUDE_TESTS=OFF -DLLVM_USE_SYMLINKS=ON \ |
24 | -DLLVM_TABLEGEN_EXE=${STAGING_BINDIR_NATIVE}/llvm-tblgen" | 24 | -DLLVM_TABLEGEN_EXE=${STAGING_BINDIR_NATIVE}/llvm-tblgen" |
25 | 25 | ||
26 | BBCLASSEXTEND = "native nativesdk" | 26 | 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" | |||
16 | 16 | ||
17 | OECMAKE_SOURCEPATH = "${S}/lldb" | 17 | OECMAKE_SOURCEPATH = "${S}/lldb" |
18 | 18 | ||
19 | EXTRA_OECMAKE = "-DLLDB_INCLUDE_TESTS=OFF \ | 19 | EXTRA_OECMAKE += "-DLLDB_INCLUDE_TESTS=OFF \ |
20 | -DLLDB_ENABLE_LUA=OFF \ | 20 | -DLLDB_ENABLE_LUA=OFF \ |
21 | -DLLDB_PYTHON_RELATIVE_PATH=${PYTHON_SITEPACKAGES_DIR} \ | 21 | -DLLDB_PYTHON_RELATIVE_PATH=${PYTHON_SITEPACKAGES_DIR} \ |
22 | -DLLDB_PYTHON_EXE_RELATIVE_PATH=${PYTHON_PN} \ | 22 | -DLLDB_PYTHON_EXE_RELATIVE_PATH=${PYTHON_PN} \ |
23 | -DLLDB_PYTHON_EXT_SUFFIX=${SOLIBSDEV} \ | 23 | -DLLDB_PYTHON_EXT_SUFFIX=${SOLIBSDEV} \ |
24 | -DLLVM_DIR=${STAGING_LIBDIR}/cmake/llvm/ \ | 24 | -DLLVM_DIR=${STAGING_LIBDIR}/cmake/llvm/ \ |
25 | -DLLVM_TABLEGEN=${STAGING_BINDIR_NATIVE}/llvm-tblgen \ | 25 | -DLLVM_TABLEGEN=${STAGING_BINDIR_NATIVE}/llvm-tblgen \ |
26 | -DLLDB_TABLEGEN_EXE=${STAGING_BINDIR_NATIVE}/lldb-tblgen \ | 26 | -DLLDB_TABLEGEN_EXE=${STAGING_BINDIR_NATIVE}/lldb-tblgen \ |
27 | -DLLDB_NO_INSTALL_DEFAULT_RPATH=ON \ | 27 | -DLLDB_NO_INSTALL_DEFAULT_RPATH=ON \ |
28 | " | 28 | " |
29 | 29 | ||
30 | PACKAGECONFIG ??= "libedit libxml2 lzma" | 30 | PACKAGECONFIG ??= "libedit libxml2 lzma" |