libcxx,compiler-rt: Remove use of non-existing runtime-llvm override
PATCH v2 1/1 libcxx,compiler-rt: Remove use of non-existing runtime-llvm override
Provide libunwind based on TC_CXX_RUNTIME
When TC_CXX_RUNTIME is set to be 'llvm' distro wants to use llvm provided runtime elements therefore provide libunwind when TC_CXX_RUNTIME = "llvm"
Signed-off-by Khem Raj <[email protected]>
---
v2: Remove all use of runtime-llvm as override
meta/recipes-devtools/clang/clang_git.bb | 4 ++-- meta/recipes-devtools/clang/libcxx_git.bb | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-)
meta/recipes-devtools/clang/clang_git.bb +2 -2
@@ -358,8 +358,8 @@ INSANE_SKIP:${PN}-libllvm = "dev-so" #Avoid SSTATE_SCAN_COMMAND running sed over llvm-config. SSTATE_SCAN_FILES:remove = "*-config" -COMPILER_RT:class-nativesdk:toolchain-clang:runtime-llvm = "-rtlib=libgcc --unwindlib=libgcc" -LIBCPLUSPLUS:class-nativesdk:toolchain-clang:runtime-llvm = "-stdlib=libstdc++" +COMPILER_RT:class-nativesdk:toolchain-clang = "-rtlib=libgcc --unwindlib=libgcc" +LIBCPLUSPLUS:class-nativesdk:toolchain-clang = "-stdlib=libstdc++" SYSROOT_DIRS:append:class-target = " ${nonarch_libdir}"
meta/recipes-devtools/clang/libcxx_git.bb +3 -3
@@ -101,7 +101,7 @@ CXXFLAGS:append:armv5 = " -mfpu=vfp2" ALLOW_EMPTY:${PN} = "1" -PROVIDES:append:runtime-llvm = " libunwind" +PROVIDES:append = " ${@bb.utils.contains("TC_CXX_RUNTIME", "llvm", "libunwind", "false", d)}" do_install:append() { if ${@bb.utils.contains("TC_CXX_RUNTIME", "llvm", "true", "false", d)}
@@ -115,8 +115,8 @@ do_install:append() { fi } -PACKAGES:append:runtime-llvm = " libunwind" -FILES:libunwind:runtime-llvm = "${libdir}/libunwind.so.*" +PACKAGES:append = "${@bb.utils.contains("TC_CXX_RUNTIME", "llvm", " libunwind", "", d)}" +FILES:libunwind = "${@bb.utils.contains("TC_CXX_RUNTIME", "llvm", " ${libdir}/libunwind.so.*", "", d)}" # Package library module manifest path FILES:${PN}-dev += "${datadir}/libc++/v1/ ${libdir}/libc++.modules.json"