libcxx: Disable llvm libunwind when using gcc as system compiler

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

2 files changed, 3 insertions, 2 deletions

diff --git a/classes/clang.bbclass b/classes/clang.bbclass
index cfd92d9..7c36da9 100644
--- a/classes/clang.bbclass
+++ b/classes/clang.bbclass
@@ -13,6 +13,7 @@ COMPILER_RT ??= "--rtlib=compiler-rt ${UNWINDLIB}"
 UNWINDLIB ??= "--unwindlib=libunwind"
 UNWINDLIB_riscv64 = "--unwindlib=libgcc"
 UNWINDLIB_riscv32 = "--unwindlib=libgcc"
+UNWINDLIB_powerpc = "--unwindlib=libgcc"
 
 LIBCPLUSPLUS ??= "--stdlib=libc++"
 
@@ -69,6 +70,6 @@ BASEDEPENDS_append_toolchain-clang_class-target = "${@clang_dep_prepend(d)}"
 
 PREFERRED_PROVIDER_libunwind_toolchain-clang = "libcxx"
 PREFERRED_PROVIDER_libunwind ?= "libunwind"
-PREFERRED_PROVIDER_libunwind_mipsarch = "libunwind"
+PREFERRED_PROVIDER_libunwind_powerpc = "libunwind"
 PREFERRED_PROVIDER_libunwind_riscv32 = "libunwind"
 PREFERRED_PROVIDER_libunwind_riscv64 = "libunwind"
diff --git a/recipes-devtools/clang/libcxx_git.bb b/recipes-devtools/clang/libcxx_git.bb
index 4882513..5e8deb9 100644
--- a/recipes-devtools/clang/libcxx_git.bb
+++ b/recipes-devtools/clang/libcxx_git.bb
@@ -17,6 +17,7 @@ TARGET_CXXFLAGS_remove_toolchain-clang = "--stdlib=libc++"
 TUNE_CCARGS_remove_toolchain-clang = "--rtlib=compiler-rt --unwindlib=libunwind --stdlib=libc++"
 
 PACKAGECONFIG ??= "unwind"
+PACKAGECONFIG_toolchain-gcc = ""
 PACKAGECONFIG_powerpc = ""
 PACKAGECONFIG_riscv64 = ""
 PACKAGECONFIG_riscv32 = ""
@@ -89,4 +90,3 @@ RPROVIDES_${PN}-locale += "${@bb.utils.contains('PACKAGECONFIG', 'unwind', 'libu
 RPROVIDES_${PN}-src += "${@bb.utils.contains('PACKAGECONFIG', 'unwind', 'libunwind-src', '', d)}"
 
 BBCLASSEXTEND = "native nativesdk"
-TOOLCHAIN_forcevariable = "clang"