clang-libs: Fix build on x86_64 and use gcc for all cross recipes

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

3 files changed, 18 insertions, 13 deletions

diff --git a/classes/clang.bbclass b/classes/clang.bbclass
index 89576cb..49a6554 100644
--- a/classes/clang.bbclass
+++ b/classes/clang.bbclass
@@ -26,6 +26,7 @@ TOOLCHAIN_class-native = "gcc"
 TOOLCHAIN_class-nativesdk = "gcc"
 TOOLCHAIN_class-cross-canadian = "gcc"
 TOOLCHAIN_class-crosssdk = "gcc"
+TOOLCHAIN_class-cross = "gcc"
 
 OVERRIDES .= "${@['', ':toolchain-${TOOLCHAIN}']['${TOOLCHAIN}' != '']}"
 OVERRIDES[vardepsexclude] += "TOOLCHAIN"
diff --git a/recipes-devtools/clang/compiler-rt_git.bb b/recipes-devtools/clang/compiler-rt_git.bb
index c796224..09ef62a 100644
--- a/recipes-devtools/clang/compiler-rt_git.bb
+++ b/recipes-devtools/clang/compiler-rt_git.bb
@@ -14,11 +14,11 @@ require clang.inc
 PV .= "+git${SRCPV}"
 
 LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=27b14ab4ce08d04c3a9a5f0ed7997362; \
-                   "
-SRC_URI = "${LLVM_GIT}/compiler-rt.git;protocol=${LLVM_GIT_PROTOCOL};branch=${BRANCH};name=compiler-rt \
-           file://0001-support-a-new-embedded-linux-target.patch \
-           file://0001-Simplify-cross-compilation.-Don-t-use-native-compile.patch \
-          "
+"
+SRC_URI =  "${LLVM_GIT}/compiler-rt.git;protocol=${LLVM_GIT_PROTOCOL};branch=${BRANCH};name=compiler-rt \
+            file://0001-support-a-new-embedded-linux-target.patch \
+            file://0001-Simplify-cross-compilation.-Don-t-use-native-compile.patch \
+"
 
 SRCREV_FORMAT = "compiler-rt"
 
@@ -29,17 +29,20 @@ inherit cmake pkgconfig pythonnative
 THUMB_TUNE_CCARGS = ""
 #TUNE_CCARGS += "-nostdlib"
 
-EXTRA_OECMAKE += "-DLLVM_BUILD_EXTERNAL_COMPILER_RT=ON \
-                  -DCOMPILER_RT_BUILD_SANITIZERS=ON \
-                  -DCOMPILER_RT_DEFAULT_TARGET_TRIPLE=${MULTIMACH_HOST_SYS} \
+EXTRA_OECMAKE += "-DCOMPILER_RT_STANDALONE_BUILD=ON \
+                  -DCOMPILER_RT_DEFAULT_TARGET_TRIPLE=${HOST_SYS} \
 "
 
+EXTRA_OECMAKE_append_libc-glibc = " -DCOMPILER_RT_BUILD_SANITIZERS=ON "
+EXTRA_OECMAKE_append_libc-musl = " -DCOMPILER_RT_BUILD_SANITIZERS=OFF "
+
 do_install_append () {
-        install -d ${D}${libdir}
-        mv ${D}${libdir}/linux/* ${D}${libdir}
-        mv ${D}${exec_prefix}/*.txt ${D}${libdir}
-        rm -rf ${D}${libdir}/libclang_rt.asan*.so
+        mv -f ${D}${libdir}/linux/* ${D}${libdir}
         rmdir ${D}${libdir}/linux
+        if [ -z `ls -A ${D}${exec_prefix}` ]; then
+                mv -f ${D}${exec_prefix}/*.txt ${D}${libdir}
+        fi
+        rm -rf ${D}${libdir}/libclang_rt.asan*.so
 }
 
 FILES_SOLIBSDEV = ""
diff --git a/recipes-devtools/clang/libcxxabi_git.bb b/recipes-devtools/clang/libcxxabi_git.bb
index 1e61675..37237e3 100644
--- a/recipes-devtools/clang/libcxxabi_git.bb
+++ b/recipes-devtools/clang/libcxxabi_git.bb
@@ -32,9 +32,10 @@ THUMB_TUNE_CCARGS = ""
 #TUNE_CCARGS += "-nostdlib"
 EXTRA_OECMAKE += "-DLIBCXXABI_LIBCXX_PATH=${S}/../libcxx \
                   -DLLVM_PATH=${S}/../../ \
-                  -DLLVM_ENABLE_LIBCXX=True \
+                  -DLLVM_ENABLE_LIBCXX=OFF \
                   -DLIBCXXABI_LIBCXX_INCLUDES=${S}/../libcxx/include \
                   -DLLVM_BUILD_EXTERNAL_COMPILER_RT=True \
+                  -DCXX_SUPPORTS_CXX11=ON \
                   -DLIBCXXABI_ENABLE_SHARED=ON \
 "
 CXXFLAGS_append_libc-musl = " -D_LIBCPP_HAS_MUSL_LIBC "