2 files changed, 9 insertions, 36 deletions

diff --git a/README.md b/README.md
index 7792280..5d6c081 100644
--- a/README.md
+++ b/README.md
@@ -83,27 +83,21 @@ compiler, switching to use LLVM runtime is done via a config metadata knob
 TC_CXX_RUNTIME = "llvm"
 ```
 
-TC_CXX_RUNTIME variable influences individual runtime elements and can be set explicitly as well
-e.g. `LIBCPLUSPLUS` `COMPILER_RT` and `UNWINDLIB`.
+TC_CXX_RUNTIME variable influences individual runtime elements  for C runtime
+C++ runtime and unwinding support.
 
-Please note that this will still use crt files from GNU compiler always, while llvm now
-do provide crt files, they have not been yet integrated into the toolchain.
+Please note that this will still use crt files from GNU compiler, while LLVM
+does provide crt files, they have not been yet integrated into the toolchain.
 
 # Default C++ Standard Library Switch
 
-Using TC_CXX_RUNTIME variable will select which C++ runtime is used, however it can be overridden
-if needed to by modifying `LIBCPLUSPLUS` variable, usually defaults used by `TC_CXX_RUNTIME` are
-best fit. e.g. below we select LLVM C++ as default C++ runtime.
-
-```shell
-LIBCPLUSPLUS = "-stdlib=libc++"
-```
+Using TC_CXX_RUNTIME variable will select which C++ runtime is used.
 
 in `local.conf`.
-You can select libstdc++ per package too by writing bbappends for them containing
+You can select a C++ runtime per package by writing bbappends for them containing
 
 ```shell
-LIBCPLUSPLUS:toolchain-clang:pn-<recipe> = "-stdlib=libc++"
+TC_CXX_RUNTIME:toolchain-clang:pn-<recipe> = "llvm"
 ```
 Defaults are chosen to be GNU for maximum compatibility with existing GNU systems. It's always
 good to use single runtime on a system, mixing runtimes can cause complications during
@@ -187,7 +181,8 @@ and OE will start using gcc to cross compile that recipe.
 If a component does not build with libc++, you can add it to `conf/nonclangable.inc` e.g.
 
 ```shell
-CXX:remove:pn-<recipe>:toolchain-clang = " -stdlib=libc++ "
+CXXFLAGS:append:pn-<recipe>:toolchain-clang = " -stdlib=libstdc++ "
+LDFLAGS:append:pn-<recipe>:toolchain-clang = " -stdlib=libstdc++ "
 ```
 
 # compiler-rt failing in do_configure with custom TARGET_VENDOR
diff --git a/conf/nonclangable.conf b/conf/nonclangable.conf
index 4465ec6..d0ca639 100644
--- a/conf/nonclangable.conf
+++ b/conf/nonclangable.conf
@@ -21,8 +21,6 @@ TOOLCHAIN:pn-grub:riscv64 = "gcc"
 TOOLCHAIN:pn-grub:aarch64 = "gcc"
 # crash embeds version of gdb which is not buildable with clang
 TOOLCHAIN:pn-crash = "gcc"
-# See https://github.com/llvm/llvm-project/issues/71925
-LIBCPLUSPLUS:pn-elfutils:toolchain-clang = "-stdlib=libstdc++"
 #| erl_bits.c:(.text+0xc2a): undefined reference to `__extendhfsf2'
 #| erl_bits.c:(.text+0x1bfa): undefined reference to `__truncsfhf2'
 #| clang-15: error: linker command failed with exit code 1 (use -v to see invocation)
@@ -429,26 +427,6 @@ COMPILER_RT:pn-ostree:libc-glibc:toolchain-clang:x86-64 = "-rtlib=libgcc --unwin
 #clang-8: error: linker command failed with exit code 1 (use -v to see invocation)
 COMPILER_RT:pn-libhugetlbfs:libc-glibc:toolchain-clang:arm = "--unwindlib=libgcc"
 
-# Does not compile with libc++ from clang 17+ anymore see
-# https://github.com/llvm/llvm-project/issues/63743
-LIBCPLUSPLUS:pn-apt:toolchain-clang = "-stdlib=libstdc++"
-
-# All following need to use libstdc++ with clang-19
-# see https://libcxx.llvm.org/ReleaseNotes/19.html#deprecations-and-removals
-LIBCPLUSPLUS:pn-pbzip2:toolchain-clang = "-stdlib=libstdc++"
-LIBCPLUSPLUS:pn-nlohmann-json:toolchain-clang = "-stdlib=libstdc++"
-LIBCPLUSPLUS:pn-paho-mqtt-cpp:toolchain-clang = "-stdlib=libstdc++"
-LIBCPLUSPLUS:pn-poco:toolchain-clang = "-stdlib=libstdc++"
-LIBCPLUSPLUS:pn-netdata:toolchain-clang = "-stdlib=libstdc++"
-LIBCPLUSPLUS:pn-cpp-netlib:toolchain-clang = "-stdlib=libstdc++"
-LIBCPLUSPLUS:pn-cpprest:toolchain-clang = "-stdlib=libstdc++"
-# See https://lists.openembedded.org/g/openembedded-devel/topic/meta_oe_patch_2_3/108964413
-LIBCPLUSPLUS:pn-tomlplusplus:toolchain-clang = "-stdlib=libstdc++"
-LIBCPLUSPLUS:pn-doxygen:toolchain-clang = "-stdlib=libstdc++"
-# https://www.mail-archive.com/freebsd-pkg-fallout@freebsd.org/msg2394451.html
-LIBCPLUSPLUS:pn-snort3:toolchain-clang = "-stdlib=libstdc++"
-LIBCPLUSPLUS:pn-libdaq:toolchain-clang = "-stdlib=libstdc++"
-
 # Uses gcc for native tools, e.g. nsinstall and passes clang options which fails so
 # let same compiler ( gcc or clang) be native/cross compiler
 # | gcc: error: unrecognized command line option ‘-Qunused-arguments’