From c9c74d269ba79abbc20919de96f1eb2b8a81edec Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 16 Mar 2017 22:54:02 -0700 Subject: clang/compiler-rt: Fix nativesdk builds break compiler-rt dep for clang Signed-off-by: Khem Raj --- recipes-devtools/clang/clang_git.bb | 2 +- recipes-devtools/clang/compiler-rt_git.bb | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) 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 = "\ EXTRA_OEMAKE += "REQUIRES_RTTI=1 VERBOSE=1" DEPENDS = "zlib libffi libxml2 binutils" -DEPENDS_remove_class-nativesdk = "nativesdk-binutils" +DEPENDS_remove_class-nativesdk = "nativesdk-binutils nativesdk-compiler-rt nativesdk-libcxx nativesdk-llvm-unwind" DEPENDS_append_class-nativesdk = " clang-native virtual/${TARGET_PREFIX}binutils-crosssdk virtual/${TARGET_PREFIX}gcc-crosssdk virtual/${TARGET_PREFIX}g++-crosssdk" DEPENDS_append_class-target = " clang-cross-${TARGET_ARCH} ${@bb.utils.contains('TOOLCHAIN', 'gcc', 'virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++', '', d)}" 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 \ -DCOMPILER_RT_DEFAULT_TARGET_TRIPLE=${HOST_ARCH}${HF}${HOST_VENDOR}-${HOST_OS} \ " +EXTRA_OECMAKE_append_class-nativesdk = "\ + -DLLVM_TABLEGEN=${STAGING_BINDIR_NATIVE}/llvm-tblgen \ + -DCLANG_TABLEGEN=${STAGING_BINDIR_NATIVE}/clang-tblgen \ +" + EXTRA_OECMAKE_append_libc-musl = " -DCOMPILER_RT_BUILD_SANITIZERS=OFF -DCOMPILER_RT_BUILD_XRAY=OFF " do_install_append () { -- cgit v1.2.3-54-g00ecf