From 61cf402d5bf95094a02d4ea3b1a60cecc04aa0f4 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 29 Jul 2025 17:27:45 -0700 Subject: [PATCH] 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 Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Richard Purdie --- meta/recipes-devtools/clang/clang_git.bb | 4 ++-- meta/recipes-devtools/clang/libcxx_git.bb | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/meta/recipes-devtools/clang/clang_git.bb b/meta/recipes-devtools/clang/clang_git.bb index 1d3cec4986..af5e0067b7 100644 --- a/meta/recipes-devtools/clang/clang_git.bb +++ b/meta/recipes-devtools/clang/clang_git.bb @@ -384,8 +384,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}" diff --git a/meta/recipes-devtools/clang/libcxx_git.bb b/meta/recipes-devtools/clang/libcxx_git.bb index d355fc3a0f..515d4a29ec 100644 --- a/meta/recipes-devtools/clang/libcxx_git.bb +++ b/meta/recipes-devtools/clang/libcxx_git.bb @@ -102,7 +102,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)} @@ -116,8 +116,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" -- 2.47.2