summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2018-03-15 21:58:49 +0100
committerMichał Górny <mgorny@gentoo.org>2018-03-15 22:12:43 +0100
commita00dd8003961520df1f52cf9fa5f069fc62d8607 (patch)
tree534a9337322bc9bae31a39fdeb7f56791be2d6d4 /sys-libs
parentsys-libs/libcxxabi: Fix calling lit with llvm-6+ installed (diff)
downloadgentoo-a00dd8003961520df1f52cf9fa5f069fc62d8607.tar.gz
gentoo-a00dd8003961520df1f52cf9fa5f069fc62d8607.tar.bz2
gentoo-a00dd8003961520df1f52cf9fa5f069fc62d8607.zip
sys-libs/libcxx: Fix calling lit with llvm-6+
Diffstat (limited to 'sys-libs')
-rw-r--r--sys-libs/libcxx/libcxx-4.0.1.ebuild10
-rw-r--r--sys-libs/libcxx/libcxx-5.0.1.ebuild10
2 files changed, 18 insertions, 2 deletions
diff --git a/sys-libs/libcxx/libcxx-4.0.1.ebuild b/sys-libs/libcxx/libcxx-4.0.1.ebuild
index 8b6e05f5ff3d..64f610ce5bb2 100644
--- a/sys-libs/libcxx/libcxx-4.0.1.ebuild
+++ b/sys-libs/libcxx/libcxx-4.0.1.ebuild
@@ -127,8 +127,16 @@ multilib_src_configure() {
# this can be any directory, it just needs to exist...
# FIXME: remove this once https://reviews.llvm.org/D25093 is merged
-DLLVM_MAIN_SRC_DIR="${T}"
- -DLIT_COMMAND="${EPREFIX}"/usr/bin/lit
)
+ 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
fi
cmake-utils_src_configure
}
diff --git a/sys-libs/libcxx/libcxx-5.0.1.ebuild b/sys-libs/libcxx/libcxx-5.0.1.ebuild
index ff69acef1792..885f8b131826 100644
--- a/sys-libs/libcxx/libcxx-5.0.1.ebuild
+++ b/sys-libs/libcxx/libcxx-5.0.1.ebuild
@@ -127,8 +127,16 @@ multilib_src_configure() {
# this can be any directory, it just needs to exist...
# FIXME: remove this once https://reviews.llvm.org/D25093 is merged
-DLLVM_MAIN_SRC_DIR="${T}"
- -DLIT_COMMAND="${EPREFIX}"/usr/bin/lit
)
+ 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
fi
cmake-utils_src_configure
}