| 1 |
commit: ddc2e725ec82a7e16518fa6a4d22b777d058aa28 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Dec 1 16:46:55 2021 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Dec 1 16:47:25 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ddc2e725 |
| 7 |
|
| 8 |
sys-libs/libcxx: Set target triple unconditionally to fix clangrt |
| 9 |
|
| 10 |
Set target triple unconditionally in order to fix building |
| 11 |
against compiler-rt. |
| 12 |
|
| 13 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 14 |
|
| 15 |
sys-libs/libcxx/libcxx-13.0.0.ebuild | 2 +- |
| 16 |
sys-libs/libcxx/libcxx-13.0.1.9999.ebuild | 2 +- |
| 17 |
sys-libs/libcxx/libcxx-13.0.1_rc1.ebuild | 2 +- |
| 18 |
sys-libs/libcxx/libcxx-14.0.0.9999.ebuild | 2 +- |
| 19 |
4 files changed, 4 insertions(+), 4 deletions(-) |
| 20 |
|
| 21 |
diff --git a/sys-libs/libcxx/libcxx-13.0.0.ebuild b/sys-libs/libcxx/libcxx-13.0.0.ebuild |
| 22 |
index dc0615878d5b..851870fd9e95 100644 |
| 23 |
--- a/sys-libs/libcxx/libcxx-13.0.0.ebuild |
| 24 |
+++ b/sys-libs/libcxx/libcxx-13.0.0.ebuild |
| 25 |
@@ -132,6 +132,7 @@ multilib_src_configure() { |
| 26 |
-DLIBCXX_INCLUDE_TESTS=$(usex test) |
| 27 |
-DLIBCXX_USE_COMPILER_RT=${want_compiler_rt} |
| 28 |
-DLIBCXX_HAS_ATOMIC_LIB=${want_gcc_s} |
| 29 |
+ -DLIBCXX_TARGET_TRIPLE="${CHOST}" |
| 30 |
-DCMAKE_SHARED_LINKER_FLAGS="${extra_libs[*]} ${LDFLAGS}" |
| 31 |
) |
| 32 |
|
| 33 |
@@ -144,7 +145,6 @@ multilib_src_configure() { |
| 34 |
-DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}" |
| 35 |
-DLIBCXX_LINK_TESTS_WITH_SHARED_LIBCXXABI=ON |
| 36 |
-DPython3_EXECUTABLE="${PYTHON}" |
| 37 |
- -DLIBCXX_TARGET_TRIPLE="${CHOST}" |
| 38 |
) |
| 39 |
fi |
| 40 |
cmake_src_configure |
| 41 |
|
| 42 |
diff --git a/sys-libs/libcxx/libcxx-13.0.1.9999.ebuild b/sys-libs/libcxx/libcxx-13.0.1.9999.ebuild |
| 43 |
index fbcd79834cfb..be5566afa3bf 100644 |
| 44 |
--- a/sys-libs/libcxx/libcxx-13.0.1.9999.ebuild |
| 45 |
+++ b/sys-libs/libcxx/libcxx-13.0.1.9999.ebuild |
| 46 |
@@ -132,6 +132,7 @@ multilib_src_configure() { |
| 47 |
-DLIBCXX_INCLUDE_TESTS=$(usex test) |
| 48 |
-DLIBCXX_USE_COMPILER_RT=${want_compiler_rt} |
| 49 |
-DLIBCXX_HAS_ATOMIC_LIB=${want_gcc_s} |
| 50 |
+ -DLIBCXX_TARGET_TRIPLE="${CHOST}" |
| 51 |
-DCMAKE_SHARED_LINKER_FLAGS="${extra_libs[*]} ${LDFLAGS}" |
| 52 |
) |
| 53 |
|
| 54 |
@@ -144,7 +145,6 @@ multilib_src_configure() { |
| 55 |
-DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}" |
| 56 |
-DLIBCXX_LINK_TESTS_WITH_SHARED_LIBCXXABI=ON |
| 57 |
-DPython3_EXECUTABLE="${PYTHON}" |
| 58 |
- -DLIBCXX_TARGET_TRIPLE="${CHOST}" |
| 59 |
) |
| 60 |
fi |
| 61 |
cmake_src_configure |
| 62 |
|
| 63 |
diff --git a/sys-libs/libcxx/libcxx-13.0.1_rc1.ebuild b/sys-libs/libcxx/libcxx-13.0.1_rc1.ebuild |
| 64 |
index 2759ecac9550..f8fd0e126832 100644 |
| 65 |
--- a/sys-libs/libcxx/libcxx-13.0.1_rc1.ebuild |
| 66 |
+++ b/sys-libs/libcxx/libcxx-13.0.1_rc1.ebuild |
| 67 |
@@ -132,6 +132,7 @@ multilib_src_configure() { |
| 68 |
-DLIBCXX_INCLUDE_TESTS=$(usex test) |
| 69 |
-DLIBCXX_USE_COMPILER_RT=${want_compiler_rt} |
| 70 |
-DLIBCXX_HAS_ATOMIC_LIB=${want_gcc_s} |
| 71 |
+ -DLIBCXX_TARGET_TRIPLE="${CHOST}" |
| 72 |
-DCMAKE_SHARED_LINKER_FLAGS="${extra_libs[*]} ${LDFLAGS}" |
| 73 |
) |
| 74 |
|
| 75 |
@@ -144,7 +145,6 @@ multilib_src_configure() { |
| 76 |
-DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}" |
| 77 |
-DLIBCXX_LINK_TESTS_WITH_SHARED_LIBCXXABI=ON |
| 78 |
-DPython3_EXECUTABLE="${PYTHON}" |
| 79 |
- -DLIBCXX_TARGET_TRIPLE="${CHOST}" |
| 80 |
) |
| 81 |
fi |
| 82 |
cmake_src_configure |
| 83 |
|
| 84 |
diff --git a/sys-libs/libcxx/libcxx-14.0.0.9999.ebuild b/sys-libs/libcxx/libcxx-14.0.0.9999.ebuild |
| 85 |
index fbcd79834cfb..be5566afa3bf 100644 |
| 86 |
--- a/sys-libs/libcxx/libcxx-14.0.0.9999.ebuild |
| 87 |
+++ b/sys-libs/libcxx/libcxx-14.0.0.9999.ebuild |
| 88 |
@@ -132,6 +132,7 @@ multilib_src_configure() { |
| 89 |
-DLIBCXX_INCLUDE_TESTS=$(usex test) |
| 90 |
-DLIBCXX_USE_COMPILER_RT=${want_compiler_rt} |
| 91 |
-DLIBCXX_HAS_ATOMIC_LIB=${want_gcc_s} |
| 92 |
+ -DLIBCXX_TARGET_TRIPLE="${CHOST}" |
| 93 |
-DCMAKE_SHARED_LINKER_FLAGS="${extra_libs[*]} ${LDFLAGS}" |
| 94 |
) |
| 95 |
|
| 96 |
@@ -144,7 +145,6 @@ multilib_src_configure() { |
| 97 |
-DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}" |
| 98 |
-DLIBCXX_LINK_TESTS_WITH_SHARED_LIBCXXABI=ON |
| 99 |
-DPython3_EXECUTABLE="${PYTHON}" |
| 100 |
- -DLIBCXX_TARGET_TRIPLE="${CHOST}" |
| 101 |
) |
| 102 |
fi |
| 103 |
cmake_src_configure |
Archives