commit:     3df40c194fe778ed17d0fa9d1eee1a4d626eef89
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 16 09:20:06 2018 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Mar 16 09:32:45 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3df40c19

sys-libs/libcxx: Pass cxx_under_test via --param (in 6+)

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

diff --git a/sys-libs/libcxx/libcxx-6.0.0.ebuild 
b/sys-libs/libcxx/libcxx-6.0.0.ebuild
index 284a0aa9eb5..5301d5f1fe6 100644
--- a/sys-libs/libcxx/libcxx-6.0.0.ebuild
+++ b/sys-libs/libcxx/libcxx-6.0.0.ebuild
@@ -139,20 +139,20 @@ multilib_src_configure() {
        )
 
        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}"
                )
        fi
        cmake-utils_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-libcxx
 }
 

diff --git a/sys-libs/libcxx/libcxx-6.0.9999.ebuild 
b/sys-libs/libcxx/libcxx-6.0.9999.ebuild
index 4e687c722c6..7454f776ff6 100644
--- a/sys-libs/libcxx/libcxx-6.0.9999.ebuild
+++ b/sys-libs/libcxx/libcxx-6.0.9999.ebuild
@@ -151,20 +151,20 @@ multilib_src_configure() {
        )
 
        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}"
                )
        fi
        cmake-utils_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-libcxx
 }
 

diff --git a/sys-libs/libcxx/libcxx-9999.ebuild 
b/sys-libs/libcxx/libcxx-9999.ebuild
index f304a076c17..a4fdb61c8c7 100644
--- a/sys-libs/libcxx/libcxx-9999.ebuild
+++ b/sys-libs/libcxx/libcxx-9999.ebuild
@@ -150,20 +150,20 @@ multilib_src_configure() {
        )
 
        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}"
                )
        fi
        cmake-utils_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-libcxx
 }
 

Reply via email to