compiler-rt,libcxx: Add --stdlib=libc++ to compiler flags

- We do not need it with CXX
- adding to compiler flag makes sure that libcxx headers are used even
  when C (clang) compiler is used
- Eventually libcxx should provide virtual/${TARGET_PREFIX}compilerlibs
  add it in comments

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

2 files changed, 8 insertions, 7 deletions

diff --git a/recipes-devtools/clang/compiler-rt_git.bb b/recipes-devtools/clang/compiler-rt_git.bb
index bc55913..3158380 100644
--- a/recipes-devtools/clang/compiler-rt_git.bb
+++ b/recipes-devtools/clang/compiler-rt_git.bb
@@ -16,9 +16,9 @@ LIC_FILES_CHKSUM = "file://compiler-rt/LICENSE.TXT;md5=f981c4637a4cd67915ac527b3
 "
 
 BASEDEPENDS_remove_toolchain-clang_class-target = "compiler-rt libcxx"
-CXX_remove_toolchain-clang = "-stdlib=libc++"
-TARGET_CXXFLAGS_remove_toolchain-clang = "-stdlib=libc++"
-TUNE_CCARGS_remove_toolchain-clang = "--rtlib=compiler-rt"
+DEPENDS_append_toolchain-clang_class-target = " virtual/${TARGET_PREFIX}compilerlibs"
+TARGET_CXXFLAGS_remove_toolchain-clang = "--stdlib=libc++"
+TUNE_CCARGS_remove_toolchain-clang = "--rtlib=compiler-rt --stdlib=libc++"
 TUNE_CCARGS_remove = "-no-integrated-as"
 DEPENDS += "ninja-native"
 DEPENDS_append_class-nativesdk = " clang-native"
diff --git a/recipes-devtools/clang/libcxx_git.bb b/recipes-devtools/clang/libcxx_git.bb
index 171ab18..26fbcdc 100644
--- a/recipes-devtools/clang/libcxx_git.bb
+++ b/recipes-devtools/clang/libcxx_git.bb
@@ -13,9 +13,9 @@ inherit cmake pythonnative
 
 DEPENDS += "ninja-native"
 BASEDEPENDS_remove_toolchain-clang = "libcxx"
-CXX_remove_toolchain-clang = "-stdlib=libc++"
-TARGET_CXXFLAGS_remove_toolchain-clang = "-stdlib=libc++"
-TUNE_CCARGS_remove_toolchain-clang = "--rtlib=compiler-rt"
+DEPENDS_append_toolchain-clang = " virtual/${TARGET_PREFIX}compilerlibs"
+TARGET_CXXFLAGS_remove_toolchain-clang = "--stdlib=libc++"
+TUNE_CCARGS_remove_toolchain-clang = "--rtlib=compiler-rt --stdlib=libc++"
 
 PACKAGECONFIG ??= "unwind"
 PACKAGECONFIG_powerpc = ""
@@ -71,8 +71,9 @@ do_install() {
 
 ALLOW_EMPTY_${PN} = "1"
 
+#PROVIDES = "virtual/${TARGET_PREFIX}compilerlibs"
+
 RDEPENDS_${PN}-dev += "${PN}-staticdev"
 
 BBCLASSEXTEND = "native nativesdk"
 TOOLCHAIN = "clang"
-