From ad14432a516db4d4752b9905d1a7127942b142ea Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 15 Sep 2025 11:10:50 -0700 Subject: [PATCH] apt: Always use libstdc++ when using clang compiler apt is not portable across non libstdc++ systems yet there is work to get it there but its still in progress Default to use libstdc++ with clang Signed-off-by: Khem Raj Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Richard Purdie --- meta/recipes-devtools/apt/apt_3.0.3.bb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta/recipes-devtools/apt/apt_3.0.3.bb b/meta/recipes-devtools/apt/apt_3.0.3.bb index 03a6869393..75d85dbbce 100644 --- a/meta/recipes-devtools/apt/apt_3.0.3.bb +++ b/meta/recipes-devtools/apt/apt_3.0.3.bb @@ -58,6 +58,10 @@ PACKAGECONFIG ??= "" # the system doesn't have merged /usr folders. PACKAGECONFIG[usrmerge] = "-DREQUIRE_MERGED_USR=ON,-DREQUIRE_MERGED_USR=OFF" +# Needed until https://salsa.debian.org/apt-team/apt/-/merge_requests/511 is fixed +CXXFLAGS:append:toolchain-clang = " -stdlib=libstdc++" +LDFLAGS:append:toolchain-clang = " -stdlib=libstdc++" + do_configure:prepend() { echo "set( CMAKE_FIND_ROOT_PATH_MODE_INCLUDE BOTH )" >> ${WORKDIR}/toolchain.cmake } -- 2.47.3