From dc5f165fbcb0abc58d49ef4a24df8329f80dec1e Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 26 May 2021 11:37:31 -0700 Subject: libcxx: Build undwinder when RUNTIME = "llvm" ensure that libcxx can be built when RUNTIME = "llvm" as it might need to pass some cmake compiler tests Signed-off-by: Khem Raj (cherry picked from commit a0a318157ca0555b0d6e20028dcb7e3e3f3c08c6) --- recipes-devtools/clang/libcxx_git.bb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/recipes-devtools/clang/libcxx_git.bb b/recipes-devtools/clang/libcxx_git.bb index d19839d..c179006 100644 --- a/recipes-devtools/clang/libcxx_git.bb +++ b/recipes-devtools/clang/libcxx_git.bb @@ -8,7 +8,7 @@ SECTION = "base" require clang.inc require common-source.inc -inherit cmake python3native +inherit cmake cmake-native python3native PACKAGECONFIG ??= "compiler-rt exceptions ${@bb.utils.contains("RUNTIME", "llvm", "unwind unwind-shared", "", d)}" PACKAGECONFIG_append_armv5 = " no-atomics" @@ -25,6 +25,8 @@ DEPENDS_append_class-target = " clang-cross-${TARGET_ARCH} virtual/${MLPREFIX}li LIBCPLUSPLUS = "" COMPILER_RT ?= "-rtlib=compiler-rt" +CXXFLAGS += "-stdlib=libstdc++" +LDFLAGS += "-unwindlib=libgcc -stdlib=libstdc++" INHIBIT_DEFAULT_DEPS = "1" LIC_FILES_CHKSUM = "file://libcxx/LICENSE.TXT;md5=55d89dd7eec8d3b4204b680e27da3953 \ @@ -73,5 +75,7 @@ CXXFLAGS_append_armv5 = " -mfpu=vfp2" ALLOW_EMPTY_${PN} = "1" +PROVIDES += "${@bb.utils.contains("RUNTIME", "llvm", "libunwind", "", d)}" + BBCLASSEXTEND = "native nativesdk" TOOLCHAIN = "clang" -- cgit v1.2.3-54-g00ecf