summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2018-12-27 17:22:23 -0800
committerKhem Raj <raj.khem@gmail.com>2018-12-27 17:29:06 -0800
commit4cb3e67d02f8491e0a250ec67b328e526dae5d66 (patch)
treebf8226f1d7d2282c81c1f1e6967cc97533eab1b3
parent3d4c48bd0afb67396aacbc444fa7f6698724860e (diff)
downloadmeta-clang-4cb3e67d02f8491e0a250ec67b328e526dae5d66.tar.gz
nativesdk-clang: Rely on runtime build via libcxx and compiler-rt recipes
This was trying to build runtime during build but we already have recipes for libcxx and compiler-rt to do that, unless we merge them into clang recipe, we need to keep using them to provide nativesdk clang runtime Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--recipes-devtools/clang/clang_git.bb2
1 files changed, 0 insertions, 2 deletions
diff --git a/recipes-devtools/clang/clang_git.bb b/recipes-devtools/clang/clang_git.bb
index 894c721..12ac0f9 100644
--- a/recipes-devtools/clang/clang_git.bb
+++ b/recipes-devtools/clang/clang_git.bb
@@ -74,7 +74,6 @@ EXTRA_OECMAKE_append_class-nativesdk = "\
74 -DCMAKE_CROSSCOMPILING:BOOL=ON \ 74 -DCMAKE_CROSSCOMPILING:BOOL=ON \
75 -DCROSS_TOOLCHAIN_FLAGS_NATIVE='-DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain-native.cmake' \ 75 -DCROSS_TOOLCHAIN_FLAGS_NATIVE='-DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain-native.cmake' \
76 -DLLVM_TARGETS_TO_BUILD='${LLVM_TARGETS_TO_BUILD}' \ 76 -DLLVM_TARGETS_TO_BUILD='${LLVM_TARGETS_TO_BUILD}' \
77 -DLLVM_ENABLE_RUNTIMES='compiler-rt;libcxx;libcxxabi;libunwind' \
78 -DLLVM_TABLEGEN=${STAGING_BINDIR_NATIVE}/llvm-tblgen \ 77 -DLLVM_TABLEGEN=${STAGING_BINDIR_NATIVE}/llvm-tblgen \
79 -DCLANG_TABLEGEN=${STAGING_BINDIR_NATIVE}/clang-tblgen \ 78 -DCLANG_TABLEGEN=${STAGING_BINDIR_NATIVE}/clang-tblgen \
80" 79"
@@ -88,7 +87,6 @@ EXTRA_OECMAKE_append_class-target = "\
88" 87"
89 88
90DEPENDS = "zlib libffi libxml2 ninja-native" 89DEPENDS = "zlib libffi libxml2 ninja-native"
91DEPENDS_remove_class-nativesdk = "nativesdk-binutils nativesdk-compiler-rt nativesdk-libcxx nativesdk-llvm-unwind"
92DEPENDS_append_class-nativesdk = " clang-native virtual/${TARGET_PREFIX}binutils-crosssdk virtual/${TARGET_PREFIX}gcc-crosssdk virtual/${TARGET_PREFIX}g++-crosssdk" 90DEPENDS_append_class-nativesdk = " clang-native virtual/${TARGET_PREFIX}binutils-crosssdk virtual/${TARGET_PREFIX}gcc-crosssdk virtual/${TARGET_PREFIX}g++-crosssdk"
93DEPENDS_append_class-target = " clang-cross-${TARGET_ARCH} ${@bb.utils.contains('TOOLCHAIN', 'gcc', 'virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++', '', d)}" 91DEPENDS_append_class-target = " clang-cross-${TARGET_ARCH} ${@bb.utils.contains('TOOLCHAIN', 'gcc', 'virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++', '', d)}"
94 92