diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2018-04-03 21:10:00 +0200 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2018-04-03 21:39:18 +0200 |
| commit | b13773d6981cd408a0fe802c46c6d1ab5b7a839f (patch) | |
| tree | d47e227dd717d1473c9a79cd06660c380106f0be /sys-libs | |
| parent | sys-libs/compiler-rt-sanitizers: Backport sandbox-2.13 use to 4/5 (diff) | |
| download | gentoo-b13773d6981cd408a0fe802c46c6d1ab5b7a839f.tar.gz gentoo-b13773d6981cd408a0fe802c46c6d1ab5b7a839f.tar.bz2 gentoo-b13773d6981cd408a0fe802c46c6d1ab5b7a839f.zip | |
sys-libs/compiler-rt-sanitizers: Fix running lit with llvm-6+ macros
Diffstat (limited to 'sys-libs')
| -rw-r--r-- | sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-4.0.1.ebuild | 11 | ||||
| -rw-r--r-- | sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-5.0.1.ebuild | 11 |
2 files changed, 20 insertions, 2 deletions
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 78b0975433f4..00662c398d63 100644 --- 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 ccfea7940925..5b150d982b49 100644 --- 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" |