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 <raj.khem@gmail.com>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-devtools/apt/apt_3.0.3.bb b/meta/recipes-devtools/apt/apt_3.0.3.bb
index 03a6869393b59b9585ebf91ab9fb2c103d57f847..75d85dbbce3406f633a8fd34752151eece97f83a 100644 (file)
--- 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
 }