[gentoo-commits] repo/gentoo:master commit in: sys-libs/libcxx/

[Michał Górny]

commit:     f4f55eea7eeaa2c756d9d1a386d80161a5da6165
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 28 12:36:47 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Jul 28 12:57:10 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4f55eea

sys-libs/libcxx: Fix 15.x with USE=-libunwind

Still need to figure out USE=libunwind and tests.

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 sys-libs/libcxx/libcxx-15.0.0.9999.ebuild | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/sys-libs/libcxx/libcxx-15.0.0.9999.ebuild 
b/sys-libs/libcxx/libcxx-15.0.0.9999.ebuild
index dcdce79b90b2..b65a070744cd 100644
--- a/sys-libs/libcxx/libcxx-15.0.0.9999.ebuild
+++ b/sys-libs/libcxx/libcxx-15.0.0.9999.ebuild
@@ -79,7 +79,7 @@ src_configure() {
        local cxxabi cxxabi_incs
        if use libcxxabi; then
                cxxabi=system-libcxxabi
-               cxxabi_incs="${EPREFIX}/usr/include/libcxxabi"
+               cxxabi_incs="${EPREFIX}/usr/include/c++/v1"
        else
                local 
gcc_inc="${EPREFIX}/usr/lib/gcc/${CHOST}/$(gcc-fullversion)/include/g++-v$(gcc-major-version)"
                cxxabi=libsupc++
@@ -146,7 +146,6 @@ multilib_src_configure() {
                -DLIBCXX_INCLUDE_TESTS=$(usex test)
                -DLIBCXX_USE_COMPILER_RT=${want_compiler_rt}
                -DLIBCXX_HAS_ATOMIC_LIB=${want_gcc_s}
-               -DLIBCXX_TARGET_TRIPLE="${CHOST}"
                -DCMAKE_SHARED_LINKER_FLAGS="${extra_libs[*]} ${LDFLAGS}"
        )