libcxx, compiler-rt: Use forcevariable to specify TOOLCHAIN override

This may already be specified by another low priority override to point
to gcc but we want to always use clang for compiling these packages

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

2 files changed, 3 insertions, 2 deletions

diff --git a/recipes-devtools/clang/compiler-rt_git.bb b/recipes-devtools/clang/compiler-rt_git.bb
index 3158380..9a15211 100644
--- a/recipes-devtools/clang/compiler-rt_git.bb
+++ b/recipes-devtools/clang/compiler-rt_git.bb
@@ -96,4 +96,4 @@ BBCLASSEXTEND = "native nativesdk"
 ALLOW_EMPTY_${PN} = "1"
 ALLOW_EMPTY_${PN}-dev = "1"
 
-TOOLCHAIN = "clang"
+TOOLCHAIN_forcevariable = "clang"
diff --git a/recipes-devtools/clang/libcxx_git.bb b/recipes-devtools/clang/libcxx_git.bb
index 26fbcdc..ad755b9 100644
--- a/recipes-devtools/clang/libcxx_git.bb
+++ b/recipes-devtools/clang/libcxx_git.bb
@@ -32,6 +32,7 @@ LIC_FILES_CHKSUM = "file://libcxx/LICENSE.TXT;md5=3de3deb8323d5cf3360104190e804a
 "
 THUMB_TUNE_CCARGS = ""
 #TUNE_CCARGS += "-nostdlib"
+EXTRA_OECMAKE_append_armv5 = " -D_LIBCXXABI_HAS_ATOMIC_BUILTINS=OFF"
 
 EXTRA_OECMAKE += "\
                   -DLIBCXX_CXX_ABI=libcxxabi \
@@ -76,4 +77,4 @@ ALLOW_EMPTY_${PN} = "1"
 RDEPENDS_${PN}-dev += "${PN}-staticdev"
 
 BBCLASSEXTEND = "native nativesdk"
-TOOLCHAIN = "clang"
+TOOLCHAIN_forcevariable = "clang"