summaryrefslogtreecommitdiffstats
path: root/recipes-devtools/clang
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2017-03-16 22:54:02 -0700
committerKhem Raj <raj.khem@gmail.com>2017-03-16 22:54:02 -0700
commitc9c74d269ba79abbc20919de96f1eb2b8a81edec (patch)
tree3819c7816ebe93111cbfc722472bb5aaf48646bf /recipes-devtools/clang
parent6cb75c093cb027c4b363e2b2104f62fd6e17f34f (diff)
downloadmeta-clang-c9c74d269ba79abbc20919de96f1eb2b8a81edec.tar.gz
clang/compiler-rt: Fix nativesdk builds break compiler-rt dep for clang
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'recipes-devtools/clang')
-rw-r--r--recipes-devtools/clang/clang_git.bb2
-rw-r--r--recipes-devtools/clang/compiler-rt_git.bb5
2 files changed, 6 insertions, 1 deletions
diff --git a/recipes-devtools/clang/clang_git.bb b/recipes-devtools/clang/clang_git.bb
index 798b9c7..9e798c4 100644
--- a/recipes-devtools/clang/clang_git.bb
+++ b/recipes-devtools/clang/clang_git.bb
@@ -102,7 +102,7 @@ EXTRA_OECMAKE_append_class-target = "\
102EXTRA_OEMAKE += "REQUIRES_RTTI=1 VERBOSE=1" 102EXTRA_OEMAKE += "REQUIRES_RTTI=1 VERBOSE=1"
103 103
104DEPENDS = "zlib libffi libxml2 binutils" 104DEPENDS = "zlib libffi libxml2 binutils"
105DEPENDS_remove_class-nativesdk = "nativesdk-binutils" 105DEPENDS_remove_class-nativesdk = "nativesdk-binutils nativesdk-compiler-rt nativesdk-libcxx nativesdk-llvm-unwind"
106DEPENDS_append_class-nativesdk = " clang-native virtual/${TARGET_PREFIX}binutils-crosssdk virtual/${TARGET_PREFIX}gcc-crosssdk virtual/${TARGET_PREFIX}g++-crosssdk" 106DEPENDS_append_class-nativesdk = " clang-native virtual/${TARGET_PREFIX}binutils-crosssdk virtual/${TARGET_PREFIX}gcc-crosssdk virtual/${TARGET_PREFIX}g++-crosssdk"
107DEPENDS_append_class-target = " clang-cross-${TARGET_ARCH} ${@bb.utils.contains('TOOLCHAIN', 'gcc', 'virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++', '', d)}" 107DEPENDS_append_class-target = " clang-cross-${TARGET_ARCH} ${@bb.utils.contains('TOOLCHAIN', 'gcc', 'virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++', '', d)}"
108 108
diff --git a/recipes-devtools/clang/compiler-rt_git.bb b/recipes-devtools/clang/compiler-rt_git.bb
index bb68f58..236fadc 100644
--- a/recipes-devtools/clang/compiler-rt_git.bb
+++ b/recipes-devtools/clang/compiler-rt_git.bb
@@ -40,6 +40,11 @@ EXTRA_OECMAKE += "-DCOMPILER_RT_STANDALONE_BUILD=ON \
40 -DCOMPILER_RT_DEFAULT_TARGET_TRIPLE=${HOST_ARCH}${HF}${HOST_VENDOR}-${HOST_OS} \ 40 -DCOMPILER_RT_DEFAULT_TARGET_TRIPLE=${HOST_ARCH}${HF}${HOST_VENDOR}-${HOST_OS} \
41" 41"
42 42
43EXTRA_OECMAKE_append_class-nativesdk = "\
44 -DLLVM_TABLEGEN=${STAGING_BINDIR_NATIVE}/llvm-tblgen \
45 -DCLANG_TABLEGEN=${STAGING_BINDIR_NATIVE}/clang-tblgen \
46"
47
43EXTRA_OECMAKE_append_libc-musl = " -DCOMPILER_RT_BUILD_SANITIZERS=OFF -DCOMPILER_RT_BUILD_XRAY=OFF " 48EXTRA_OECMAKE_append_libc-musl = " -DCOMPILER_RT_BUILD_SANITIZERS=OFF -DCOMPILER_RT_BUILD_XRAY=OFF "
44 49
45do_install_append () { 50do_install_append () {