From e47ed0398fdaeee872cea9990117db31baede1a4 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Sun, 13 Sep 2020 00:21:28 -0700
Subject: meta-environment-ext: Add bbappend to insert clang variables into env

This helps defining CLANG* env vars in extensible SDK

Fixes Issue #370

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 recipes-core/meta/clang-environment.inc            | 19 +++++++++++++++++++
 recipes-core/meta/meta-environment-extsdk.bbappend |  3 +++
 recipes-core/meta/meta-environment.bbappend        | 20 ++------------------
 3 files changed, 24 insertions(+), 18 deletions(-)
 create mode 100644 recipes-core/meta/clang-environment.inc
 create mode 100644 recipes-core/meta/meta-environment-extsdk.bbappend

diff --git a/recipes-core/meta/clang-environment.inc b/recipes-core/meta/clang-environment.inc
new file mode 100644
index 0000000..725a431
--- /dev/null
+++ b/recipes-core/meta/clang-environment.inc
@@ -0,0 +1,19 @@
+export TARGET_CLANGCC_ARCH = "${TARGET_CC_ARCH}"
+TARGET_CLANGCC_ARCH_remove = "-mthumb-interwork"
+TARGET_CLANGCC_ARCH_remove = "-mmusl"
+TARGET_CLANGCC_ARCH_remove = "-muclibc"
+TARGET_CLANGCC_ARCH_remove = "-meb"
+TARGET_CLANGCC_ARCH_remove = "-mel"
+TARGET_CLANGCC_ARCH_append = "${@bb.utils.contains("TUNE_FEATURES", "bigendian", " -mbig-endian", " -mlittle-endian", d)}"
+TARGET_CLANGCC_ARCH_remove_powerpc = "-mhard-float"
+TARGET_CLANGCC_ARCH_remove_powerpc = "-mno-spe"
+
+create_sdk_files_append() {
+        script=${SDK_OUTPUT}/${SDKPATH}/environment-setup-${REAL_MULTIMACH_TARGET_SYS}
+        if ${@bb.utils.contains('CLANGSDK', '1', 'true', 'false', d)}; then
+            echo 'export CLANGCC="${TARGET_PREFIX}clang ${TARGET_CLANGCC_ARCH} --sysroot=$SDKTARGETSYSROOT"' >> $script
+            echo 'export CLANGCXX="${TARGET_PREFIX}clang++ ${TARGET_CLANGCC_ARCH} --sysroot=$SDKTARGETSYSROOT"' >> $script
+            echo 'export CLANGCPP="${TARGET_PREFIX}clang -E ${TARGET_CLANGCC_ARCH} --sysroot=$SDKTARGETSYSROOT"' >> $script
+            echo 'export CLANG_TIDY_EXE="${TARGET_PREFIX}clang-tidy ${TARGET_CLANGCC_ARCH} --sysroot=$SDKTARGETSYSROOT"' >> $script
+        fi
+}
diff --git a/recipes-core/meta/meta-environment-extsdk.bbappend b/recipes-core/meta/meta-environment-extsdk.bbappend
new file mode 100644
index 0000000..e867074
--- /dev/null
+++ b/recipes-core/meta/meta-environment-extsdk.bbappend
@@ -0,0 +1,3 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+require clang-environment.inc
diff --git a/recipes-core/meta/meta-environment.bbappend b/recipes-core/meta/meta-environment.bbappend
index 725a431..e867074 100644
--- a/recipes-core/meta/meta-environment.bbappend
+++ b/recipes-core/meta/meta-environment.bbappend
@@ -1,19 +1,3 @@
-export TARGET_CLANGCC_ARCH = "${TARGET_CC_ARCH}"
-TARGET_CLANGCC_ARCH_remove = "-mthumb-interwork"
-TARGET_CLANGCC_ARCH_remove = "-mmusl"
-TARGET_CLANGCC_ARCH_remove = "-muclibc"
-TARGET_CLANGCC_ARCH_remove = "-meb"
-TARGET_CLANGCC_ARCH_remove = "-mel"
-TARGET_CLANGCC_ARCH_append = "${@bb.utils.contains("TUNE_FEATURES", "bigendian", " -mbig-endian", " -mlittle-endian", d)}"
-TARGET_CLANGCC_ARCH_remove_powerpc = "-mhard-float"
-TARGET_CLANGCC_ARCH_remove_powerpc = "-mno-spe"
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-create_sdk_files_append() {
-        script=${SDK_OUTPUT}/${SDKPATH}/environment-setup-${REAL_MULTIMACH_TARGET_SYS}
-        if ${@bb.utils.contains('CLANGSDK', '1', 'true', 'false', d)}; then
-            echo 'export CLANGCC="${TARGET_PREFIX}clang ${TARGET_CLANGCC_ARCH} --sysroot=$SDKTARGETSYSROOT"' >> $script
-            echo 'export CLANGCXX="${TARGET_PREFIX}clang++ ${TARGET_CLANGCC_ARCH} --sysroot=$SDKTARGETSYSROOT"' >> $script
-            echo 'export CLANGCPP="${TARGET_PREFIX}clang -E ${TARGET_CLANGCC_ARCH} --sysroot=$SDKTARGETSYSROOT"' >> $script
-            echo 'export CLANG_TIDY_EXE="${TARGET_PREFIX}clang-tidy ${TARGET_CLANGCC_ARCH} --sysroot=$SDKTARGETSYSROOT"' >> $script
-        fi
-}
+require clang-environment.inc
-- 
cgit v1.2.3-54-g00ecf