sys-libs/compiler-rt-sanitizers: Fix running lit with llvm-6+ macros

diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-4.0.1.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-4.0.1.ebuild
index 78b0975433f4a9559c1344dc8d19ba40f62f170d..00662c398d6363f86fd2af422ec069e7020bfae7 100644 (file)
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-4.0.1.ebuild
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-4.0.1.ebuild
@@ -106,9 +106,18 @@ src_configure() {
                -DCOMPILER_RT_BUILD_XRAY=ON
        )
        if use test; then
+               if has_version '>=sys-devel/llvm-6'; then
+                       mycmakeargs+=(
+                               -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+                       )
+               else
+                       mycmakeargs+=(
+                               -DLIT_COMMAND="${EPREFIX}"/usr/bin/lit
+                       )
+               fi
+
                mycmakeargs+=(
                        -DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
-                       -DLIT_COMMAND="${EPREFIX}/usr/bin/lit"
 
                        # they are created during src_test()
                        -DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang"

diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-5.0.1.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-5.0.1.ebuild
index ccfea7940925152d13a98911fb7e8cf3eff01f3b..5b150d982b49665b6203ab7b2bb705d88118a78b 100644 (file)
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-5.0.1.ebuild
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-5.0.1.ebuild
@@ -110,9 +110,18 @@ src_configure() {
                -DCOMPILER_RT_BUILD_XRAY=ON
        )
        if use test; then
+               if has_version '>=sys-devel/llvm-6'; then
+                       mycmakeargs+=(
+                               -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+                       )
+               else
+                       mycmakeargs+=(
+                               -DLIT_COMMAND="${EPREFIX}"/usr/bin/lit
+                       )
+               fi
+
                mycmakeargs+=(
                        -DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
-                       -DLIT_COMMAND="${EPREFIX}/usr/bin/lit"
 
                        # they are created during src_test()
                        -DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang"