From cbbdb0e5654758480ca89a7cc516981ebf81ddc4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
Date: Wed, 1 Dec 2021 17:41:19 +0100
Subject: [PATCH] sys-libs/libcxxabi: Set target triple unconditionally to fix
 clangrt
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 sys-libs/libcxxabi/libcxxabi-13.0.0.ebuild      | 3 ++-
 sys-libs/libcxxabi/libcxxabi-13.0.1.9999.ebuild | 3 ++-
 sys-libs/libcxxabi/libcxxabi-13.0.1_rc1.ebuild  | 3 ++-
 sys-libs/libcxxabi/libcxxabi-14.0.0.9999.ebuild | 3 ++-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/sys-libs/libcxxabi/libcxxabi-13.0.0.ebuild b/sys-libs/libcxxabi/libcxxabi-13.0.0.ebuild
index 08e4724c02596..628752042eea5 100644
--- a/sys-libs/libcxxabi/libcxxabi-13.0.0.ebuild
+++ b/sys-libs/libcxxabi/libcxxabi-13.0.0.ebuild
@@ -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}"
 	)
 
 	"${@}"
diff --git a/sys-libs/libcxxabi/libcxxabi-13.0.1.9999.ebuild b/sys-libs/libcxxabi/libcxxabi-13.0.1.9999.ebuild
index 66ecb7faa6edd..36ccca5e938ad 100644
--- a/sys-libs/libcxxabi/libcxxabi-13.0.1.9999.ebuild
+++ b/sys-libs/libcxxabi/libcxxabi-13.0.1.9999.ebuild
@@ -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}"
 	)
 
 	"${@}"
diff --git a/sys-libs/libcxxabi/libcxxabi-13.0.1_rc1.ebuild b/sys-libs/libcxxabi/libcxxabi-13.0.1_rc1.ebuild
index 66ecb7faa6edd..36ccca5e938ad 100644
--- a/sys-libs/libcxxabi/libcxxabi-13.0.1_rc1.ebuild
+++ b/sys-libs/libcxxabi/libcxxabi-13.0.1_rc1.ebuild
@@ -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}"
 	)
 
 	"${@}"
diff --git a/sys-libs/libcxxabi/libcxxabi-14.0.0.9999.ebuild b/sys-libs/libcxxabi/libcxxabi-14.0.0.9999.ebuild
index 66ecb7faa6edd..36ccca5e938ad 100644
--- a/sys-libs/libcxxabi/libcxxabi-14.0.0.9999.ebuild
+++ b/sys-libs/libcxxabi/libcxxabi-14.0.0.9999.ebuild
@@ -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}"
 	)
 
 	"${@}"