clang: Add clang runtime to dependencies when toolchain is clang

A step towards unplugging gcc runtime

Signed-off-by: Khem Raj <raj.khem@gmail.com>

5 files changed, 14 insertions, 2 deletions

diff --git a/classes/clang.bbclass b/classes/clang.bbclass
index f9faff7..f8b05ee 100644
--- a/classes/clang.bbclass
+++ b/classes/clang.bbclass
@@ -36,8 +36,8 @@ OVERRIDES[vardepsexclude] += "TOOLCHAIN"
 
 def clang_dep_prepend(d):
     if not d.getVar('INHIBIT_DEFAULT_DEPS', False):
-        if not oe.utils.inherits(d, 'allarch'):
-            return " clang-cross-${TARGET_ARCH}"
+        if not oe.utils.inherits(d, 'allarch') :
+            return " clang-cross-${TARGET_ARCH} compiler-rt libcxx llvm-libunwind"
     return ""
 
 BASEDEPENDS_remove_toolchain-clang_class-target = "virtual/${TARGET_PREFIX}gcc"
diff --git a/recipes-devtools/clang/compiler-rt_git.bb b/recipes-devtools/clang/compiler-rt_git.bb
index fa9f0ce..bb68f58 100644
--- a/recipes-devtools/clang/compiler-rt_git.bb
+++ b/recipes-devtools/clang/compiler-rt_git.bb
@@ -23,6 +23,10 @@ SRC_URI =  "${LLVM_GIT}/compiler-rt.git;protocol=${LLVM_GIT_PROTOCOL};branch=${B
 
 SRCREV_FORMAT = "compiler-rt"
 
+BASEDEPENDS_remove_toolchain-clang_class-target = "compiler-rt"
+BASEDEPENDS_remove_toolchain-clang_class-target = "libcxx"
+BASEDEPENDS_remove_toolchain-clang_class-target = "llvm-libunwind"
+
 S = "${WORKDIR}/git"
 
 inherit cmake pkgconfig pythonnative
diff --git a/recipes-devtools/clang/libcxx_git.bb b/recipes-devtools/clang/libcxx_git.bb
index 9167181..c6e2dd5 100644
--- a/recipes-devtools/clang/libcxx_git.bb
+++ b/recipes-devtools/clang/libcxx_git.bb
@@ -12,6 +12,10 @@ inherit cmake pythonnative
 PV .= "+git${SRCPV}"
 
 DEPENDS += "libcxxabi"
+BASEDEPENDS_remove_toolchain-clang_class-target = "libcxx"
+BASEDEPENDS_remove_toolchain-clang_class-target = "llvm-libunwind"
+BASEDEPENDS_remove_toolchain-clang_class-target = "compiler-rt"
+
 
 LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=7b3a0e1b99822669d630011defe9bfd9; \
                    "
diff --git a/recipes-devtools/clang/libcxxabi_git.bb b/recipes-devtools/clang/libcxxabi_git.bb
index 86f1464..300e47f 100644
--- a/recipes-devtools/clang/libcxxabi_git.bb
+++ b/recipes-devtools/clang/libcxxabi_git.bb
@@ -14,6 +14,8 @@ inherit cmake
 PV .= "+git${SRCPV}"
 
 DEPENDS += "compiler-rt"
+BASEDEPENDS_remove_toolchain-clang_class-target = "libcxx"
+BASEDEPENDS_remove_toolchain-clang_class-target = "llvm-libunwind"
 
 LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=8ae94dd6195890583eee15a988b6ea79; \
                    "
diff --git a/recipes-devtools/clang/llvm-libunwind_git.bb b/recipes-devtools/clang/llvm-libunwind_git.bb
index c421743..8a9b2c5 100644
--- a/recipes-devtools/clang/llvm-libunwind_git.bb
+++ b/recipes-devtools/clang/llvm-libunwind_git.bb
@@ -12,6 +12,8 @@ inherit cmake
 PV .= "+git${SRCPV}"
 
 DEPENDS += "libcxx"
+BASEDEPENDS_remove_toolchain-clang_class-target = "llvm-libunwind"
+BASEDEPENDS_remove_toolchain-clang_class-target = "compiler-rt"
 PROVIDES += "libunwind"
 
 LIC_FILES_CHKSUM = "file://../libcxx/LICENSE.TXT;md5=7b3a0e1b99822669d630011defe9bfd9; \