From patchwork Mon Sep 15 19:11:08 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 70266 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0E937CAC59D for ; Mon, 15 Sep 2025 19:11:28 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.1335.1757963479789522680 for ; Mon, 15 Sep 2025 12:11:19 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 241F71424 for ; Mon, 15 Sep 2025 12:11:11 -0700 (PDT) Received: from cesw-amp-gbt-1s-m12830-04.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 0683D3F694 for ; Mon, 15 Sep 2025 12:11:18 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH v3 7/8] clang: use EXTRA_OECMAKE += Date: Mon, 15 Sep 2025 20:11:08 +0100 Message-ID: <20250915191109.1117663-7-ross.burton@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250915191109.1117663-1-ross.burton@arm.com> References: <20250915191109.1117663-1-ross.burton@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 15 Sep 2025 19:11:28 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/223504 Don't assign EXTRA_OECMAKE so that the include files can set defaults. Signed-off-by: Ross Burton --- 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(-) diff --git a/meta/recipes-devtools/clang/libclc_git.bb b/meta/recipes-devtools/clang/libclc_git.bb index e56cf2eb6c0..60909339e70 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 02006e0edc9..b0261ad2cb6 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 eafc3cb3128..ecab8c09a75 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"