libcxx: Fix native build

Use libgcc with clang-native to compile it

Fixes #465

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

1 files changed, 13 insertions, 11 deletions

diff --git a/classes/clang.bbclass b/classes/clang.bbclass
index 0f9e46c..0fbdd2d 100644
--- a/classes/clang.bbclass
+++ b/classes/clang.bbclass
@@ -1,31 +1,33 @@
 # Add the necessary override
-CCACHE_COMPILERCHECK_class-target_toolchain-clang ?= "%compiler% -v"
-HOST_CC_ARCH_prepend_class-target_toolchain-clang = "-target ${HOST_SYS} "
-CC_class-target_toolchain-clang  = "${CCACHE}${HOST_PREFIX}clang ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}"
-CXX_class-target_toolchain-clang = "${CCACHE}${HOST_PREFIX}clang++ ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}"
-CPP_class-target_toolchain-clang = "${CCACHE}${HOST_PREFIX}clang ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS} -E"
-CCLD_class-target_toolchain-clang = "${CCACHE}${HOST_PREFIX}clang ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}"
-RANLIB_class-target_toolchain-clang = "${HOST_PREFIX}llvm-ranlib"
-AR_class-target_toolchain-clang = "${HOST_PREFIX}llvm-ar"
-NM_class-target_toolchain-clang = "${HOST_PREFIX}llvm-nm"
+CCACHE_COMPILERCHECK_toolchain-clang ?= "%compiler% -v"
+HOST_CC_ARCH_prepend_toolchain-clang = "-target ${HOST_SYS} "
+CC_toolchain-clang  = "${CCACHE}${HOST_PREFIX}clang ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}"
+CXX_toolchain-clang = "${CCACHE}${HOST_PREFIX}clang++ ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}"
+CPP_toolchain-clang = "${CCACHE}${HOST_PREFIX}clang ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS} -E"
+CCLD_toolchain-clang = "${CCACHE}${HOST_PREFIX}clang ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}"
+RANLIB_toolchain-clang = "${HOST_PREFIX}llvm-ranlib"
+AR_toolchain-clang = "${HOST_PREFIX}llvm-ar"
+NM_toolchain-clang = "${HOST_PREFIX}llvm-nm"
 
 LTO_toolchain-clang = "${@bb.utils.contains('DISTRO_FEATURES', 'thin-lto', '-flto=thin', '-flto -fuse-ld=lld', d)}"
 PACKAGE_DEBUG_SPLIT_STYLE_toolchain-clang = "debug-without-src"
 
 COMPILER_RT ??= ""
+COMPILER_RT_class-native = "-rtlib=libgcc ${UNWINDLIB}"
 COMPILER_RT_powerpc = "-rtlib=libgcc ${UNWINDLIB}"
 COMPILER_RT_armeb = "-rtlib=libgcc ${UNWINDLIB}"
 COMPILER_RT_libc-klibc = "-rtlib=libgcc ${UNWINDLIB}"
 
 UNWINDLIB ??= ""
+UNWINDLIB_class-native = "--unwindlib=libgcc"
 UNWINDLIB_powerpc = "--unwindlib=libgcc"
 UNWINDLIB_armeb = "--unwindlib=libgcc"
 UNWINDLIB_libc-klibc = "--unwindlib=libgcc"
 
 LIBCPLUSPLUS ??= ""
 
-TARGET_CXXFLAGS_append_toolchain-clang = " ${LIBCPLUSPLUS}"
-TUNE_CCARGS_append_toolchain-clang = " ${COMPILER_RT} ${LIBCPLUSPLUS}"
+CXXFLAGS_append_toolchain-clang = " ${LIBCPLUSPLUS}"
+LDFLAGS_append_toolchain-clang = " ${COMPILER_RT} ${LIBCPLUSPLUS}"
 
 TUNE_CCARGS_remove_toolchain-clang = "-meb"
 TUNE_CCARGS_remove_toolchain-clang = "-mel"