From 427b6cb4cdd03bf437f295952dcdda12213f157b Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sun, 2 Aug 2020 10:32:02 -0700 Subject: libcxx: Default to compiler-rt when it is in PACKAGECONFIG This ensures right C runtime is used as desired by user Signed-off-by: Khem Raj --- recipes-devtools/clang/libcxx_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-devtools/clang/libcxx_git.bb b/recipes-devtools/clang/libcxx_git.bb index 789da5b..1dfcc69 100644 --- a/recipes-devtools/clang/libcxx_git.bb +++ b/recipes-devtools/clang/libcxx_git.bb @@ -24,7 +24,7 @@ DEPENDS += "ninja-native" DEPENDS_append_class-target = " clang-cross-${TARGET_ARCH} virtual/${MLPREFIX}libc virtual/${TARGET_PREFIX}compilerlibs" LIBCPLUSPLUS = "" -COMPILER_RT ?= "-rtlib=compiler-rt ${UNWINDLIB}" +COMPILER_RT ?= "${@bb.utils.contains("PACKAGECONFIG", "compiler-rt", "-rtlib=compiler-rt", "", d)} ${UNWINDLIB}" UNWINDLIB ?= "${@bb.utils.contains("RUNTIME", "gnu", "--unwindlib=libgcc", "", d)}" INHIBIT_DEFAULT_DEPS = "1" -- cgit v1.2.3-54-g00ecf