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

[Michał Górny]

commit:     35593c25d4f97bce61995d0ef24deb7955e655fd
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 16 09:17:59 2018 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Mar 16 09:32:42 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35593c25

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

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

diff --git a/sys-libs/libcxxabi/libcxxabi-6.0.0.ebuild 
b/sys-libs/libcxxabi/libcxxabi-6.0.0.ebuild
index fa34603a346..dcfa621c3ce 100644
--- a/sys-libs/libcxxabi/libcxxabi-6.0.0.ebuild
+++ b/sys-libs/libcxxabi/libcxxabi-6.0.0.ebuild
@@ -71,9 +71,14 @@ multilib_src_configure() {
                -DLIBCXXABI_LIBUNWIND_INCLUDES="${EPREFIX}"/usr/include
        )
        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
@@ -101,11 +106,6 @@ build_libcxx() {
 }
 
 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
-
        # build a local copy of libc++ for testing to avoid circular dep
        build_libcxx
        cp "${BUILD_DIR}"/libcxx/lib/libc++* "${BUILD_DIR}/$(get_libdir)/" || 
die

diff --git a/sys-libs/libcxxabi/libcxxabi-6.0.9999.ebuild 
b/sys-libs/libcxxabi/libcxxabi-6.0.9999.ebuild
index 23becd1b655..4807ec3d1d3 100644
--- a/sys-libs/libcxxabi/libcxxabi-6.0.9999.ebuild
+++ b/sys-libs/libcxxabi/libcxxabi-6.0.9999.ebuild
@@ -74,9 +74,14 @@ multilib_src_configure() {
                -DLIBCXXABI_LIBUNWIND_INCLUDES="${EPREFIX}"/usr/include
        )
        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
@@ -104,11 +109,6 @@ build_libcxx() {
 }
 
 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
-
        # build a local copy of libc++ for testing to avoid circular dep
        build_libcxx
        cp "${BUILD_DIR}"/libcxx/lib/libc++* "${BUILD_DIR}/$(get_libdir)/" || 
die

diff --git a/sys-libs/libcxxabi/libcxxabi-9999.ebuild 
b/sys-libs/libcxxabi/libcxxabi-9999.ebuild
index 4d3bcb155cc..6158b6b4d7e 100644
--- a/sys-libs/libcxxabi/libcxxabi-9999.ebuild
+++ b/sys-libs/libcxxabi/libcxxabi-9999.ebuild
@@ -73,9 +73,14 @@ multilib_src_configure() {
                -DLIBCXXABI_LIBUNWIND_INCLUDES="${EPREFIX}"/usr/include
        )
        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
@@ -103,11 +108,6 @@ build_libcxx() {
 }
 
 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
-
        # build a local copy of libc++ for testing to avoid circular dep
        build_libcxx
        cp "${BUILD_DIR}"/libcxx/lib/libc++* "${BUILD_DIR}/$(get_libdir)/" || 
die