From 6b552ae7442252b07abf41680696a904fea87ece Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 2 Oct 2019 18:42:00 -0700 Subject: libcxx: Add packageconfig for compiler-rt use This helps in disabling compiler-rt e.g. on risc-v if we need to enable exceptions then we need to use libgcc_s, since llvm-libunwind is not yet ported to risc-v For ppc, enable compiler-rt Signed-off-by: Khem Raj --- recipes-devtools/clang/libcxx_git.bb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/recipes-devtools/clang/libcxx_git.bb b/recipes-devtools/clang/libcxx_git.bb index b1fb023..bf6c70a 100644 --- a/recipes-devtools/clang/libcxx_git.bb +++ b/recipes-devtools/clang/libcxx_git.bb @@ -10,15 +10,15 @@ require common-source.inc inherit cmake pythonnative -PACKAGECONFIG ??= "unwind exceptions" -PACKAGECONFIG_powerpc = "" -PACKAGECONFIG_riscv32 = "" -PACKAGECONFIG_riscv64 = "" +PACKAGECONFIG ??= "compiler-rt unwind exceptions" +PACKAGECONFIG_riscv32 = "exceptions" +PACKAGECONFIG_riscv64 = "exceptions" PACKAGECONFIG_append_armv5 = " no-atomics" PACKAGECONFIG[unwind] = "-DLIBCXXABI_USE_LLVM_UNWINDER=ON,-DLIBCXXABI_USE_LLVM_UNWINDER=OFF,llvm-libunwind" PACKAGECONFIG[exceptions] = "-DLIBCXXABI_ENABLE_EXCEPTIONS=ON -DDLIBCXX_ENABLE_EXCEPTIONS=ON,-DLIBCXXABI_ENABLE_EXCEPTIONS=OFF -DLIBCXX_ENABLE_EXCEPTIONS=OFF -DCMAKE_REQUIRED_FLAGS='-fno-exceptions'," PACKAGECONFIG[no-atomics] = "-D_LIBCXXABI_HAS_ATOMIC_BUILTINS=OFF -DCMAKE_SHARED_LINKER_FLAGS='-latomic',," +PACKAGECONFIG[compiler-rt] = "-DLIBCXXABI_USE_COMPILER_RT=ON -DLIBCXX_USE_COMPILER_RT=ON,-DLIBCXXABI_USE_COMPILER_RT=OFF -DLIBCXX_USE_COMPILER_RT=OFF,compiler-rt" DEPENDS += "ninja-native" DEPENDS_append_class-target = " compiler-rt clang-cross-${TARGET_ARCH} virtual/${MLPREFIX}libc virtual/${TARGET_PREFIX}compilerlibs" -- cgit v1.2.3-54-g00ecf