@@ -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"
@@ -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"
@@ -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"
Don't assign EXTRA_OECMAKE so that the include files can set defaults. Signed-off-by: Ross Burton <ross.burton@arm.com> --- meta/recipes-devtools/clang/libclc_git.bb | 2 +- meta/recipes-devtools/clang/lld_git.bb | 6 +++--- meta/recipes-devtools/clang/lldb_git.bb | 18 +++++++++--------- 3 files changed, 13 insertions(+), 13 deletions(-)