gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-08-06 00:48:18 -07:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
Set target triple unconditionally in order to fix failing builds
against compiler-rt.

Closes: https://bugs.gentoo.org/827943
Signed-off-by: Michał Górny <mgorny@gentoo.org>
This commit is contained in:
Michał Górny
2021-12-01 17:41:19 +01:00
parent a2e2309a68
commit cbbdb0e565
4 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sys-libs/libcxxabi/libcxxabi-13.0.0.ebuild
View File

@@ -75,6 +75,7 @@ multilib_src_configure() {
# upstream is omitting standard search path for this
# probably because gcc & clang are bundling their own unwind.h
-DLIBCXXABI_LIBUNWIND_INCLUDES="${EPREFIX}"/usr/include
-DLIBCXXABI_TARGET_TRIPLE="${CHOST}"
)
if use test; then
local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null)
@@ -84,7 +85,6 @@ multilib_src_configure() {
-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}"
-DPython3_EXECUTABLE="${PYTHON}"
-DLIBCXXABI_TARGET_TRIPLE="${CHOST}"
)
fi
cmake_src_configure
@@ -105,6 +105,7 @@ wrap_libcxx() {
-DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
-DLIBCXX_HAS_GCC_S_LIB=OFF
-DLIBCXX_INCLUDE_TESTS=OFF
-DLIBCXX_TARGET_TRIPLE="${CHOST}"
)
"${@}"

3
sys-libs/libcxxabi/libcxxabi-13.0.1.9999.ebuild
View File

@@ -75,6 +75,7 @@ multilib_src_configure() {
# upstream is omitting standard search path for this
# probably because gcc & clang are bundling their own unwind.h
-DLIBCXXABI_LIBUNWIND_INCLUDES="${EPREFIX}"/usr/include
-DLIBCXXABI_TARGET_TRIPLE="${CHOST}"
)
if use test; then
local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null)
@@ -84,7 +85,6 @@ multilib_src_configure() {
-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}"
-DPython3_EXECUTABLE="${PYTHON}"
-DLIBCXXABI_TARGET_TRIPLE="${CHOST}"
)
fi
cmake_src_configure
@@ -105,6 +105,7 @@ wrap_libcxx() {
-DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
-DLIBCXX_HAS_GCC_S_LIB=OFF
-DLIBCXX_INCLUDE_TESTS=OFF
-DLIBCXX_TARGET_TRIPLE="${CHOST}"
)
"${@}"

3
sys-libs/libcxxabi/libcxxabi-13.0.1_rc1.ebuild
View File

@@ -75,6 +75,7 @@ multilib_src_configure() {
# upstream is omitting standard search path for this
# probably because gcc & clang are bundling their own unwind.h
-DLIBCXXABI_LIBUNWIND_INCLUDES="${EPREFIX}"/usr/include
-DLIBCXXABI_TARGET_TRIPLE="${CHOST}"
)
if use test; then
local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null)
@@ -84,7 +85,6 @@ multilib_src_configure() {
-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}"
-DPython3_EXECUTABLE="${PYTHON}"
-DLIBCXXABI_TARGET_TRIPLE="${CHOST}"
)
fi
cmake_src_configure
@@ -105,6 +105,7 @@ wrap_libcxx() {
-DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
-DLIBCXX_HAS_GCC_S_LIB=OFF
-DLIBCXX_INCLUDE_TESTS=OFF
-DLIBCXX_TARGET_TRIPLE="${CHOST}"
)
"${@}"

3
sys-libs/libcxxabi/libcxxabi-14.0.0.9999.ebuild
View File

@@ -75,6 +75,7 @@ multilib_src_configure() {
# upstream is omitting standard search path for this
# probably because gcc & clang are bundling their own unwind.h
-DLIBCXXABI_LIBUNWIND_INCLUDES="${EPREFIX}"/usr/include
-DLIBCXXABI_TARGET_TRIPLE="${CHOST}"
)
if use test; then
local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null)
@@ -84,7 +85,6 @@ multilib_src_configure() {
-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}"
-DPython3_EXECUTABLE="${PYTHON}"
-DLIBCXXABI_TARGET_TRIPLE="${CHOST}"
)
fi
cmake_src_configure
@@ -105,6 +105,7 @@ wrap_libcxx() {
-DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
-DLIBCXX_HAS_GCC_S_LIB=OFF
-DLIBCXX_INCLUDE_TESTS=OFF
-DLIBCXX_TARGET_TRIPLE="${CHOST}"
)
"${@}"