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

diff --git a/sys-libs/libcxxabi/libcxxabi-6.0.0.ebuild b/sys-libs/libcxxabi/libcxxabi-6.0.0.ebuild
index fa34603a3466c6f49d4dda28e372e00b502d6554..dcfa621c3ce10fb26cad4f0c80ef62704e44030e 100644 (file)
--- 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 23becd1b655b1f0bf521e01353375d9bf7bd7d80..4807ec3d1d313b593cb4ae38a361825fc26455f3 100644 (file)
--- 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 4d3bcb155cc61eca300c7be10cdc15ad768b6bb8..6158b6b4d7e96140a589a472608f7e0572e3c502 100644 (file)
--- 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