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

[Michał Górny]

commit:     d19909355276eee4b6599789bc31ee30d9705928
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 16 09:12:56 2018 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Mar 16 09:32:39 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1990935

sys-libs/llvm-libunwind: Pass cxx_under_test via --param

 sys-libs/llvm-libunwind/llvm-libunwind-6.0.0.ebuild    | 12 ++++++------
 sys-libs/llvm-libunwind/llvm-libunwind-6.0.9999.ebuild | 12 ++++++------
 sys-libs/llvm-libunwind/llvm-libunwind-9999.ebuild     | 12 ++++++------
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-6.0.0.ebuild 
b/sys-libs/llvm-libunwind/llvm-libunwind-6.0.0.ebuild
index fe3c0e9d642..6da407e13a1 100644
--- a/sys-libs/llvm-libunwind/llvm-libunwind-6.0.0.ebuild
+++ b/sys-libs/llvm-libunwind/llvm-libunwind-6.0.0.ebuild
@@ -73,9 +73,14 @@ multilib_src_configure() {
                -DLIBUNWIND_ENABLE_CROSS_UNWINDING=ON
        )
        if use test; then
+               local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 
2>/dev/null)
+               local jobs=${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" 
"$(get_nproc)")}
+
+               [[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang 
for tests"
+
                mycmakeargs+=(
                        -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-                       -DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs 
"${MAKEOPTS}" "$(get_nproc)")}"
+                       
-DLLVM_LIT_ARGS="-vv;-j;${jobs};--param=cxx_under_test=${clang_path}"
                        -DLIBUNWIND_LIBCXX_PATH="${WORKDIR}"/libcxx
                )
        fi
@@ -84,11 +89,6 @@ multilib_src_configure() {
 }
 
 multilib_src_test() {
-       local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null)
-
-       [[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests"
-       sed -i -e "/cxx_under_test/s^\".*\"^\"${clang_path}\"^" 
test/lit.site.cfg || die
-
        cmake-utils_src_make check-unwind
 }
 

diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-6.0.9999.ebuild 
b/sys-libs/llvm-libunwind/llvm-libunwind-6.0.9999.ebuild
index 83db4453f60..367803c62f0 100644
--- a/sys-libs/llvm-libunwind/llvm-libunwind-6.0.9999.ebuild
+++ b/sys-libs/llvm-libunwind/llvm-libunwind-6.0.9999.ebuild
@@ -73,9 +73,14 @@ multilib_src_configure() {
                -DLIBUNWIND_ENABLE_CROSS_UNWINDING=ON
        )
        if use test; then
+               local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 
2>/dev/null)
+               local jobs=${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" 
"$(get_nproc)")}
+
+               [[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang 
for tests"
+
                mycmakeargs+=(
                        -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-                       -DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs 
"${MAKEOPTS}" "$(get_nproc)")}"
+                       
-DLLVM_LIT_ARGS="-vv;-j;${jobs};--param=cxx_under_test=${clang_path}"
                        -DLIBUNWIND_LIBCXX_PATH="${WORKDIR}"/libcxx
                )
        fi
@@ -84,11 +89,6 @@ multilib_src_configure() {
 }
 
 multilib_src_test() {
-       local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null)
-
-       [[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests"
-       sed -i -e "/cxx_under_test/s^\".*\"^\"${clang_path}\"^" 
test/lit.site.cfg || die
-
        cmake-utils_src_make check-unwind
 }
 

diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-9999.ebuild 
b/sys-libs/llvm-libunwind/llvm-libunwind-9999.ebuild
index 238afe790e6..f38e06e1ba4 100644
--- a/sys-libs/llvm-libunwind/llvm-libunwind-9999.ebuild
+++ b/sys-libs/llvm-libunwind/llvm-libunwind-9999.ebuild
@@ -72,9 +72,14 @@ multilib_src_configure() {
                -DLIBUNWIND_ENABLE_CROSS_UNWINDING=ON
        )
        if use test; then
+               local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 
2>/dev/null)
+               local jobs=${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" 
"$(get_nproc)")}
+
+               [[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang 
for tests"
+
                mycmakeargs+=(
                        -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-                       -DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs 
"${MAKEOPTS}" "$(get_nproc)")}"
+                       
-DLLVM_LIT_ARGS="-vv;-j;${jobs};--param=cxx_under_test=${clang_path}"
                        -DLIBUNWIND_LIBCXX_PATH="${WORKDIR}"/libcxx
                )
        fi
@@ -83,11 +88,6 @@ multilib_src_configure() {
 }
 
 multilib_src_test() {
-       local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null)
-
-       [[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests"
-       sed -i -e "/cxx_under_test/s^\".*\"^\"${clang_path}\"^" 
test/lit.site.cfg || die
-
        cmake-utils_src_make check-unwind
 }