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

[Michał Górny]

commit:     a2e2309a6851200acea35fe0bd9040dbde507fa9
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Dec  1 16:39:32 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Dec  1 16:47:24 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2e2309a

sys-libs/llvm-libunwind: Set target triple unconditionally

While this is not strictly required for this package,
set LIBUNWIND_TARGET_TRIPLE unconditionally for consistency with libc++
and libc++abi.

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

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

diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-13.0.0.ebuild 
b/sys-libs/llvm-libunwind/llvm-libunwind-13.0.0.ebuild
index 7878ad2cc3f1..607404341462 100644
--- a/sys-libs/llvm-libunwind/llvm-libunwind-13.0.0.ebuild
+++ b/sys-libs/llvm-libunwind/llvm-libunwind-13.0.0.ebuild
@@ -55,6 +55,7 @@ multilib_src_configure() {
                -DLLVM_LIBDIR_SUFFIX=${libdir#lib}
                -DLIBUNWIND_ENABLE_ASSERTIONS=$(usex debug)
                -DLIBUNWIND_ENABLE_STATIC=$(usex static-libs)
+               -DLIBUNWIND_TARGET_TRIPLE="${CHOST}"
                -DLLVM_INCLUDE_TESTS=$(usex test)
 
                # support non-native unwinding; given it's small enough,
@@ -72,7 +73,6 @@ multilib_src_configure() {
                        -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
                        
-DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}"
                        -DLIBUNWIND_LIBCXX_PATH="${WORKDIR}/libcxx"
-                       -DLIBUNWIND_TARGET_TRIPLE="${CHOST}"
                )
        fi
 

diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-13.0.1.9999.ebuild 
b/sys-libs/llvm-libunwind/llvm-libunwind-13.0.1.9999.ebuild
index c16a58ffa99e..b2e400ff295b 100644
--- a/sys-libs/llvm-libunwind/llvm-libunwind-13.0.1.9999.ebuild
+++ b/sys-libs/llvm-libunwind/llvm-libunwind-13.0.1.9999.ebuild
@@ -55,6 +55,7 @@ multilib_src_configure() {
                -DLLVM_LIBDIR_SUFFIX=${libdir#lib}
                -DLIBUNWIND_ENABLE_ASSERTIONS=$(usex debug)
                -DLIBUNWIND_ENABLE_STATIC=$(usex static-libs)
+               -DLIBUNWIND_TARGET_TRIPLE="${CHOST}"
                -DLLVM_INCLUDE_TESTS=$(usex test)
 
                # support non-native unwinding; given it's small enough,
@@ -72,7 +73,6 @@ multilib_src_configure() {
                        -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
                        
-DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}"
                        -DLIBUNWIND_LIBCXX_PATH="${WORKDIR}/libcxx"
-                       -DLIBUNWIND_TARGET_TRIPLE="${CHOST}"
                )
        fi
 

diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-13.0.1_rc1.ebuild 
b/sys-libs/llvm-libunwind/llvm-libunwind-13.0.1_rc1.ebuild
index c16a58ffa99e..b2e400ff295b 100644
--- a/sys-libs/llvm-libunwind/llvm-libunwind-13.0.1_rc1.ebuild
+++ b/sys-libs/llvm-libunwind/llvm-libunwind-13.0.1_rc1.ebuild
@@ -55,6 +55,7 @@ multilib_src_configure() {
                -DLLVM_LIBDIR_SUFFIX=${libdir#lib}
                -DLIBUNWIND_ENABLE_ASSERTIONS=$(usex debug)
                -DLIBUNWIND_ENABLE_STATIC=$(usex static-libs)
+               -DLIBUNWIND_TARGET_TRIPLE="${CHOST}"
                -DLLVM_INCLUDE_TESTS=$(usex test)
 
                # support non-native unwinding; given it's small enough,
@@ -72,7 +73,6 @@ multilib_src_configure() {
                        -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
                        
-DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}"
                        -DLIBUNWIND_LIBCXX_PATH="${WORKDIR}/libcxx"
-                       -DLIBUNWIND_TARGET_TRIPLE="${CHOST}"
                )
        fi
 

diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-14.0.0.9999.ebuild 
b/sys-libs/llvm-libunwind/llvm-libunwind-14.0.0.9999.ebuild
index c16a58ffa99e..b2e400ff295b 100644
--- a/sys-libs/llvm-libunwind/llvm-libunwind-14.0.0.9999.ebuild
+++ b/sys-libs/llvm-libunwind/llvm-libunwind-14.0.0.9999.ebuild
@@ -55,6 +55,7 @@ multilib_src_configure() {
                -DLLVM_LIBDIR_SUFFIX=${libdir#lib}
                -DLIBUNWIND_ENABLE_ASSERTIONS=$(usex debug)
                -DLIBUNWIND_ENABLE_STATIC=$(usex static-libs)
+               -DLIBUNWIND_TARGET_TRIPLE="${CHOST}"
                -DLLVM_INCLUDE_TESTS=$(usex test)
 
                # support non-native unwinding; given it's small enough,
@@ -72,7 +73,6 @@ multilib_src_configure() {
                        -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
                        
-DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}"
                        -DLIBUNWIND_LIBCXX_PATH="${WORKDIR}/libcxx"
-                       -DLIBUNWIND_TARGET_TRIPLE="${CHOST}"
                )
        fi