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

[Michał Górny]

commit:     ddc2e725ec82a7e16518fa6a4d22b777d058aa28
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Dec  1 16:46:55 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Dec  1 16:47:25 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ddc2e725

sys-libs/libcxx: Set target triple unconditionally to fix clangrt

Set target triple unconditionally in order to fix building
against compiler-rt.

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

 sys-libs/libcxx/libcxx-13.0.0.ebuild      | 2 +-
 sys-libs/libcxx/libcxx-13.0.1.9999.ebuild | 2 +-
 sys-libs/libcxx/libcxx-13.0.1_rc1.ebuild  | 2 +-
 sys-libs/libcxx/libcxx-14.0.0.9999.ebuild | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sys-libs/libcxx/libcxx-13.0.0.ebuild 
b/sys-libs/libcxx/libcxx-13.0.0.ebuild
index dc0615878d5b..851870fd9e95 100644
--- a/sys-libs/libcxx/libcxx-13.0.0.ebuild
+++ b/sys-libs/libcxx/libcxx-13.0.0.ebuild
@@ -132,6 +132,7 @@ 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}"
        )
 
@@ -144,7 +145,6 @@ multilib_src_configure() {
                        
-DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}"
                        -DLIBCXX_LINK_TESTS_WITH_SHARED_LIBCXXABI=ON
                        -DPython3_EXECUTABLE="${PYTHON}"
-                       -DLIBCXX_TARGET_TRIPLE="${CHOST}"
                )
        fi
        cmake_src_configure

diff --git a/sys-libs/libcxx/libcxx-13.0.1.9999.ebuild 
b/sys-libs/libcxx/libcxx-13.0.1.9999.ebuild
index fbcd79834cfb..be5566afa3bf 100644
--- a/sys-libs/libcxx/libcxx-13.0.1.9999.ebuild
+++ b/sys-libs/libcxx/libcxx-13.0.1.9999.ebuild
@@ -132,6 +132,7 @@ 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}"
        )
 
@@ -144,7 +145,6 @@ multilib_src_configure() {
                        
-DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}"
                        -DLIBCXX_LINK_TESTS_WITH_SHARED_LIBCXXABI=ON
                        -DPython3_EXECUTABLE="${PYTHON}"
-                       -DLIBCXX_TARGET_TRIPLE="${CHOST}"
                )
        fi
        cmake_src_configure

diff --git a/sys-libs/libcxx/libcxx-13.0.1_rc1.ebuild 
b/sys-libs/libcxx/libcxx-13.0.1_rc1.ebuild
index 2759ecac9550..f8fd0e126832 100644
--- a/sys-libs/libcxx/libcxx-13.0.1_rc1.ebuild
+++ b/sys-libs/libcxx/libcxx-13.0.1_rc1.ebuild
@@ -132,6 +132,7 @@ 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}"
        )
 
@@ -144,7 +145,6 @@ multilib_src_configure() {
                        
-DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}"
                        -DLIBCXX_LINK_TESTS_WITH_SHARED_LIBCXXABI=ON
                        -DPython3_EXECUTABLE="${PYTHON}"
-                       -DLIBCXX_TARGET_TRIPLE="${CHOST}"
                )
        fi
        cmake_src_configure

diff --git a/sys-libs/libcxx/libcxx-14.0.0.9999.ebuild 
b/sys-libs/libcxx/libcxx-14.0.0.9999.ebuild
index fbcd79834cfb..be5566afa3bf 100644
--- a/sys-libs/libcxx/libcxx-14.0.0.9999.ebuild
+++ b/sys-libs/libcxx/libcxx-14.0.0.9999.ebuild
@@ -132,6 +132,7 @@ 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}"
        )
 
@@ -144,7 +145,6 @@ multilib_src_configure() {
                        
-DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}"
                        -DLIBCXX_LINK_TESTS_WITH_SHARED_LIBCXXABI=ON
                        -DPython3_EXECUTABLE="${PYTHON}"
-                       -DLIBCXX_TARGET_TRIPLE="${CHOST}"
                )
        fi
        cmake_src_configure