| 1 |
commit: cbbdb0e5654758480ca89a7cc516981ebf81ddc4 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Dec 1 16:41:19 2021 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Dec 1 16:47:24 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cbbdb0e5 |
| 7 |
|
| 8 |
sys-libs/libcxxabi: Set target triple unconditionally to fix clangrt |
| 9 |
|
| 10 |
Set target triple unconditionally in order to fix failing builds |
| 11 |
against compiler-rt. |
| 12 |
|
| 13 |
Closes: https://bugs.gentoo.org/827943 |
| 14 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 15 |
|
| 16 |
sys-libs/libcxxabi/libcxxabi-13.0.0.ebuild | 3 ++- |
| 17 |
sys-libs/libcxxabi/libcxxabi-13.0.1.9999.ebuild | 3 ++- |
| 18 |
sys-libs/libcxxabi/libcxxabi-13.0.1_rc1.ebuild | 3 ++- |
| 19 |
sys-libs/libcxxabi/libcxxabi-14.0.0.9999.ebuild | 3 ++- |
| 20 |
4 files changed, 8 insertions(+), 4 deletions(-) |
| 21 |
|
| 22 |
diff --git a/sys-libs/libcxxabi/libcxxabi-13.0.0.ebuild b/sys-libs/libcxxabi/libcxxabi-13.0.0.ebuild |
| 23 |
index 08e4724c0259..628752042eea 100644 |
| 24 |
--- a/sys-libs/libcxxabi/libcxxabi-13.0.0.ebuild |
| 25 |
+++ b/sys-libs/libcxxabi/libcxxabi-13.0.0.ebuild |
| 26 |
@@ -75,6 +75,7 @@ multilib_src_configure() { |
| 27 |
# upstream is omitting standard search path for this |
| 28 |
# probably because gcc & clang are bundling their own unwind.h |
| 29 |
-DLIBCXXABI_LIBUNWIND_INCLUDES="${EPREFIX}"/usr/include |
| 30 |
+ -DLIBCXXABI_TARGET_TRIPLE="${CHOST}" |
| 31 |
) |
| 32 |
if use test; then |
| 33 |
local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null) |
| 34 |
@@ -84,7 +85,6 @@ multilib_src_configure() { |
| 35 |
-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit" |
| 36 |
-DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}" |
| 37 |
-DPython3_EXECUTABLE="${PYTHON}" |
| 38 |
- -DLIBCXXABI_TARGET_TRIPLE="${CHOST}" |
| 39 |
) |
| 40 |
fi |
| 41 |
cmake_src_configure |
| 42 |
@@ -105,6 +105,7 @@ wrap_libcxx() { |
| 43 |
-DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl) |
| 44 |
-DLIBCXX_HAS_GCC_S_LIB=OFF |
| 45 |
-DLIBCXX_INCLUDE_TESTS=OFF |
| 46 |
+ -DLIBCXX_TARGET_TRIPLE="${CHOST}" |
| 47 |
) |
| 48 |
|
| 49 |
"${@}" |
| 50 |
|
| 51 |
diff --git a/sys-libs/libcxxabi/libcxxabi-13.0.1.9999.ebuild b/sys-libs/libcxxabi/libcxxabi-13.0.1.9999.ebuild |
| 52 |
index 66ecb7faa6ed..36ccca5e938a 100644 |
| 53 |
--- a/sys-libs/libcxxabi/libcxxabi-13.0.1.9999.ebuild |
| 54 |
+++ b/sys-libs/libcxxabi/libcxxabi-13.0.1.9999.ebuild |
| 55 |
@@ -75,6 +75,7 @@ multilib_src_configure() { |
| 56 |
# upstream is omitting standard search path for this |
| 57 |
# probably because gcc & clang are bundling their own unwind.h |
| 58 |
-DLIBCXXABI_LIBUNWIND_INCLUDES="${EPREFIX}"/usr/include |
| 59 |
+ -DLIBCXXABI_TARGET_TRIPLE="${CHOST}" |
| 60 |
) |
| 61 |
if use test; then |
| 62 |
local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null) |
| 63 |
@@ -84,7 +85,6 @@ multilib_src_configure() { |
| 64 |
-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit" |
| 65 |
-DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}" |
| 66 |
-DPython3_EXECUTABLE="${PYTHON}" |
| 67 |
- -DLIBCXXABI_TARGET_TRIPLE="${CHOST}" |
| 68 |
) |
| 69 |
fi |
| 70 |
cmake_src_configure |
| 71 |
@@ -105,6 +105,7 @@ wrap_libcxx() { |
| 72 |
-DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl) |
| 73 |
-DLIBCXX_HAS_GCC_S_LIB=OFF |
| 74 |
-DLIBCXX_INCLUDE_TESTS=OFF |
| 75 |
+ -DLIBCXX_TARGET_TRIPLE="${CHOST}" |
| 76 |
) |
| 77 |
|
| 78 |
"${@}" |
| 79 |
|
| 80 |
diff --git a/sys-libs/libcxxabi/libcxxabi-13.0.1_rc1.ebuild b/sys-libs/libcxxabi/libcxxabi-13.0.1_rc1.ebuild |
| 81 |
index 66ecb7faa6ed..36ccca5e938a 100644 |
| 82 |
--- a/sys-libs/libcxxabi/libcxxabi-13.0.1_rc1.ebuild |
| 83 |
+++ b/sys-libs/libcxxabi/libcxxabi-13.0.1_rc1.ebuild |
| 84 |
@@ -75,6 +75,7 @@ multilib_src_configure() { |
| 85 |
# upstream is omitting standard search path for this |
| 86 |
# probably because gcc & clang are bundling their own unwind.h |
| 87 |
-DLIBCXXABI_LIBUNWIND_INCLUDES="${EPREFIX}"/usr/include |
| 88 |
+ -DLIBCXXABI_TARGET_TRIPLE="${CHOST}" |
| 89 |
) |
| 90 |
if use test; then |
| 91 |
local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null) |
| 92 |
@@ -84,7 +85,6 @@ multilib_src_configure() { |
| 93 |
-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit" |
| 94 |
-DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}" |
| 95 |
-DPython3_EXECUTABLE="${PYTHON}" |
| 96 |
- -DLIBCXXABI_TARGET_TRIPLE="${CHOST}" |
| 97 |
) |
| 98 |
fi |
| 99 |
cmake_src_configure |
| 100 |
@@ -105,6 +105,7 @@ wrap_libcxx() { |
| 101 |
-DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl) |
| 102 |
-DLIBCXX_HAS_GCC_S_LIB=OFF |
| 103 |
-DLIBCXX_INCLUDE_TESTS=OFF |
| 104 |
+ -DLIBCXX_TARGET_TRIPLE="${CHOST}" |
| 105 |
) |
| 106 |
|
| 107 |
"${@}" |
| 108 |
|
| 109 |
diff --git a/sys-libs/libcxxabi/libcxxabi-14.0.0.9999.ebuild b/sys-libs/libcxxabi/libcxxabi-14.0.0.9999.ebuild |
| 110 |
index 66ecb7faa6ed..36ccca5e938a 100644 |
| 111 |
--- a/sys-libs/libcxxabi/libcxxabi-14.0.0.9999.ebuild |
| 112 |
+++ b/sys-libs/libcxxabi/libcxxabi-14.0.0.9999.ebuild |
| 113 |
@@ -75,6 +75,7 @@ multilib_src_configure() { |
| 114 |
# upstream is omitting standard search path for this |
| 115 |
# probably because gcc & clang are bundling their own unwind.h |
| 116 |
-DLIBCXXABI_LIBUNWIND_INCLUDES="${EPREFIX}"/usr/include |
| 117 |
+ -DLIBCXXABI_TARGET_TRIPLE="${CHOST}" |
| 118 |
) |
| 119 |
if use test; then |
| 120 |
local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null) |
| 121 |
@@ -84,7 +85,6 @@ multilib_src_configure() { |
| 122 |
-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit" |
| 123 |
-DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}" |
| 124 |
-DPython3_EXECUTABLE="${PYTHON}" |
| 125 |
- -DLIBCXXABI_TARGET_TRIPLE="${CHOST}" |
| 126 |
) |
| 127 |
fi |
| 128 |
cmake_src_configure |
| 129 |
@@ -105,6 +105,7 @@ wrap_libcxx() { |
| 130 |
-DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl) |
| 131 |
-DLIBCXX_HAS_GCC_S_LIB=OFF |
| 132 |
-DLIBCXX_INCLUDE_TESTS=OFF |
| 133 |
+ -DLIBCXX_TARGET_TRIPLE="${CHOST}" |
| 134 |
) |
| 135 |
|
| 136 |
"${@}" |
Archives