| 1 |
commit: b13773d6981cd408a0fe802c46c6d1ab5b7a839f |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Apr 3 19:10:00 2018 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Apr 3 19:39:18 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b13773d6 |
| 7 |
|
| 8 |
sys-libs/compiler-rt-sanitizers: Fix running lit with llvm-6+ macros |
| 9 |
|
| 10 |
.../compiler-rt-sanitizers-4.0.1.ebuild | 11 ++++++++++- |
| 11 |
.../compiler-rt-sanitizers-5.0.1.ebuild | 11 ++++++++++- |
| 12 |
2 files changed, 20 insertions(+), 2 deletions(-) |
| 13 |
|
| 14 |
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 |
| 15 |
index 78b0975433f..00662c398d6 100644 |
| 16 |
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-4.0.1.ebuild |
| 17 |
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-4.0.1.ebuild |
| 18 |
@@ -106,9 +106,18 @@ src_configure() { |
| 19 |
-DCOMPILER_RT_BUILD_XRAY=ON |
| 20 |
) |
| 21 |
if use test; then |
| 22 |
+ if has_version '>=sys-devel/llvm-6'; then |
| 23 |
+ mycmakeargs+=( |
| 24 |
+ -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit" |
| 25 |
+ ) |
| 26 |
+ else |
| 27 |
+ mycmakeargs+=( |
| 28 |
+ -DLIT_COMMAND="${EPREFIX}"/usr/bin/lit |
| 29 |
+ ) |
| 30 |
+ fi |
| 31 |
+ |
| 32 |
mycmakeargs+=( |
| 33 |
-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm" |
| 34 |
- -DLIT_COMMAND="${EPREFIX}/usr/bin/lit" |
| 35 |
|
| 36 |
# they are created during src_test() |
| 37 |
-DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang" |
| 38 |
|
| 39 |
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 |
| 40 |
index ccfea794092..5b150d982b4 100644 |
| 41 |
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-5.0.1.ebuild |
| 42 |
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-5.0.1.ebuild |
| 43 |
@@ -110,9 +110,18 @@ src_configure() { |
| 44 |
-DCOMPILER_RT_BUILD_XRAY=ON |
| 45 |
) |
| 46 |
if use test; then |
| 47 |
+ if has_version '>=sys-devel/llvm-6'; then |
| 48 |
+ mycmakeargs+=( |
| 49 |
+ -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit" |
| 50 |
+ ) |
| 51 |
+ else |
| 52 |
+ mycmakeargs+=( |
| 53 |
+ -DLIT_COMMAND="${EPREFIX}"/usr/bin/lit |
| 54 |
+ ) |
| 55 |
+ fi |
| 56 |
+ |
| 57 |
mycmakeargs+=( |
| 58 |
-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm" |
| 59 |
- -DLIT_COMMAND="${EPREFIX}/usr/bin/lit" |
| 60 |
|
| 61 |
# they are created during src_test() |
| 62 |
-DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang" |
Archives