compiler-rt,libcxx,libcxxabi: Fix build by removing dependence on libgcc and libstdc++

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

3 files changed, 14 insertions, 6 deletions

diff --git a/recipes-devtools/clang/compiler-rt_git.bb b/recipes-devtools/clang/compiler-rt_git.bb
index 1ae44e8..16bbb2f 100644
--- a/recipes-devtools/clang/compiler-rt_git.bb
+++ b/recipes-devtools/clang/compiler-rt_git.bb
@@ -21,7 +21,8 @@ SRCREV_FORMAT = "compiler-rt"
 
 S = "${WORKDIR}/git"
 
-THUMB_TUNE_CCARGS = " -ffreestanding -nostdlib -nostdinc++ -nobuiltininc"
+THUMB_TUNE_CCARGS = ""
+TUNE_CCARGS += "-ffreestanding -nostdlib"
 
 EXTRA_OEMAKE += "REQUIRES_RTTI=1 VERBOSE=1"
 
diff --git a/recipes-devtools/clang/libcxx_git.bb b/recipes-devtools/clang/libcxx_git.bb
index 67676de..9c651e8 100644
--- a/recipes-devtools/clang/libcxx_git.bb
+++ b/recipes-devtools/clang/libcxx_git.bb
@@ -27,8 +27,14 @@ SRCREV_FORMAT = "llvm_libcxx_libcxxabi"
 
 S = "${WORKDIR}/git/projects/libcxx"
 
-THUMB_TUNE_CCARGS = " -ffreestanding -nostdlib -nostdinc++ -nobuiltininc"
-
-EXTRA_OECMAKE += "-DLIBCXX_CXX_ABI=libcxxabi -DLIBCXXABI_LIBCXX_PATH=${S}/../libcxx -DLIBCXX_CXX_ABI_INCLUDE_PATHS=${S}/../libcxxabi/include -DLLVM_PATH=${S}/../../"
+THUMB_TUNE_CCARGS = ""
+TUNE_CCARGS += "-ffreestanding -nostdlib"
+
+EXTRA_OECMAKE += "-DLIBCXX_CXX_ABI=libcxxabi \
+                  -DLIBCXXABI_LIBCXX_PATH=${S}/../libcxx \
+                  -DLIBCXX_CXX_ABI_INCLUDE_PATHS=${S}/../libcxxabi/include \
+                  -DLLVM_PATH=${S}/../../ \
+                  -DLIBCXX_ENABLE_SHARED=False \
+                 "
 
 BBCLASSEXTEND = "native nativesdk"
diff --git a/recipes-devtools/clang/libcxxabi_git.bb b/recipes-devtools/clang/libcxxabi_git.bb
index 34b5241..101fc24 100644
--- a/recipes-devtools/clang/libcxxabi_git.bb
+++ b/recipes-devtools/clang/libcxxabi_git.bb
@@ -26,8 +26,9 @@ SRCREV_FORMAT = "llvm_libcxx_libcxxabi"
 
 S = "${WORKDIR}/git/projects/libcxxabi"
 
-THUMB_TUNE_CCARGS = " -ffreestanding -nostdlib -nostdinc++ -nobuiltininc"
+THUMB_TUNE_CCARGS = ""
+TUNE_CCARGS += "-ffreestanding -nostdlib"
 
-EXTRA_OECMAKE += "-DLIBCXXABI_LIBCXX_PATH=${S}/../libcxx -DLLVM_PATH=${S}/../../ -DLIBCXXABI_LIBCXX_INCLUDES=${S}/../libcxx/include"
+EXTRA_OECMAKE += "-DLIBCXXABI_LIBCXX_PATH=${S}/../libcxx -DLLVM_PATH=${S}/../../ -DLIBCXXABI_LIBCXX_INCLUDES=${S}/../libcxx/include -DLLVM_ENABLE_LIBCXX=True -DLLVM_BUILD_EXTERNAL_COMPILER_RT=True -DLIBCXXABI_ENABLE_SHARED=False"
 
 BBCLASSEXTEND = "native nativesdk"