From ccfdb47cc4991a393a2d2fefe8420bdef56e7318 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 25 Sep 2019 14:31:10 -0700 Subject: clang: Add variable CLANGSDK to control including clang in SDK CLANGSDK ?= "1" is default which means clang will be included into SDK if one is using clang only for full build and dont intend to distribute it as cross compiler SDK then set CLANGSDK = "" in local.conf or in another config metadata file Signed-off-by: Khem Raj --- conf/layer.conf | 3 +++ .../packagegroups/nativesdk-packagegroup-sdk-host.bbappend | 4 +--- .../packagegroups/packagegroup-core-standalone-sdk-target.bbappend | 7 +------ recipes-core/packagegroups/packagegroup-cross-canadian.bbappend | 7 ++----- 4 files changed, 7 insertions(+), 14 deletions(-) diff --git a/conf/layer.conf b/conf/layer.conf index 531ad3a..48d98b2 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -22,5 +22,8 @@ PREFERRED_PROVIDER_libgcc-initial = "libgcc-initial" #PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}compilerlibs_forcevariable = "libcxx" INHERIT += "clang" +# include clang in SDK +CLANGSDK ??= "1" + require conf/nonclangable.conf require conf/nonscanable.conf diff --git a/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bbappend b/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bbappend index a8e81aa..3472eb3 100644 --- a/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bbappend +++ b/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bbappend @@ -1,3 +1 @@ -NATIVESDKCLANG ?= "nativesdk-clang" - -RDEPENDS_${PN} += "${NATIVESDKCLANG}" +RDEPENDS_${PN} += "${@'nativesdk-clang' if '${CLANGSDK}' else ''}" diff --git a/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bbappend b/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bbappend index dd0f83c..2a727e0 100644 --- a/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bbappend +++ b/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bbappend @@ -1,6 +1 @@ -RRECOMMENDS_${PN} += "\ - libcxx-dev \ - libcxx-staticdev \ - compiler-rt-dev \ - compiler-rt-staticdev \ -" +RRECOMMENDS_${PN} += "${@'libcxx-dev libcxx-staticdev compiler-rt-dev compiler-rt-staticdev' if '${CLANGSDK}' else ''}" diff --git a/recipes-core/packagegroups/packagegroup-cross-canadian.bbappend b/recipes-core/packagegroups/packagegroup-cross-canadian.bbappend index 2618d20..4bbd4ab 100644 --- a/recipes-core/packagegroups/packagegroup-cross-canadian.bbappend +++ b/recipes-core/packagegroups/packagegroup-cross-canadian.bbappend @@ -1,5 +1,2 @@ -CLANGCROSSCANADIAN ?= "clang-cross-canadian-${TRANSLATED_TARGET_ARCH}" -CLANGCROSSCANADIAN_riscv64 = "" -RDEPENDS_${PN} += "\ - ${@all_multilib_tune_values(d, 'CLANGCROSSCANADIAN')} \ -" +CLANGCROSSCANADIAN = "${@bb.utils.contains('CLANGSDK', '1', 'clang-cross-canadian-${TRANSLATED_TARGET_ARCH}', '', d)}" +RDEPENDS_${PN} += "${@all_multilib_tune_values(d, 'CLANGCROSSCANADIAN')}" -- cgit v1.2.3-54-g00ecf