1 |
commit: a564bdff02df5a878ddf90988538a457596443e1 |
2 |
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Jun 19 08:52:31 2017 +0000 |
4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jun 19 08:52:49 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a564bdff |
7 |
|
8 |
sys-devel/llvm: Fix path to llvm-tblgen when cross compiling. |
9 |
|
10 |
Package-Manager: Portage-2.3.6, Repoman-2.3.2 |
11 |
|
12 |
sys-devel/llvm/llvm-4.0.0-r2.ebuild | 7 ++++--- |
13 |
sys-devel/llvm/llvm-9999.ebuild | 7 ++++--- |
14 |
2 files changed, 8 insertions(+), 6 deletions(-) |
15 |
|
16 |
diff --git a/sys-devel/llvm/llvm-4.0.0-r2.ebuild b/sys-devel/llvm/llvm-4.0.0-r2.ebuild |
17 |
index 86ec2572ef8..e599e21fc6e 100644 |
18 |
--- a/sys-devel/llvm/llvm-4.0.0-r2.ebuild |
19 |
+++ b/sys-devel/llvm/llvm-4.0.0-r2.ebuild |
20 |
@@ -155,11 +155,12 @@ multilib_src_configure() { |
21 |
fi |
22 |
|
23 |
if tc-is-cross-compiler; then |
24 |
- [[ -x "/usr/bin/llvm-tblgen" ]] \ |
25 |
- || die "/usr/bin/llvm-tblgen not found or usable" |
26 |
+ local tblgen="${EPREFIX}/usr/lib/llvm/${SLOT}/bin/llvm-tblgen" |
27 |
+ [[ -x "${tblgen}" ]] \ |
28 |
+ || die "${tblgen} not found or usable" |
29 |
mycmakeargs+=( |
30 |
-DCMAKE_CROSSCOMPILING=ON |
31 |
- -DLLVM_TABLEGEN=/usr/bin/llvm-tblgen |
32 |
+ -DLLVM_TABLEGEN="${tblgen}" |
33 |
) |
34 |
fi |
35 |
|
36 |
|
37 |
diff --git a/sys-devel/llvm/llvm-9999.ebuild b/sys-devel/llvm/llvm-9999.ebuild |
38 |
index 545cfbbcb49..99121e917a0 100644 |
39 |
--- a/sys-devel/llvm/llvm-9999.ebuild |
40 |
+++ b/sys-devel/llvm/llvm-9999.ebuild |
41 |
@@ -154,11 +154,12 @@ multilib_src_configure() { |
42 |
fi |
43 |
|
44 |
if tc-is-cross-compiler; then |
45 |
- [[ -x "/usr/bin/llvm-tblgen" ]] \ |
46 |
- || die "/usr/bin/llvm-tblgen not found or usable" |
47 |
+ local tblgen="${EPREFIX}/usr/lib/llvm/${SLOT}/bin/llvm-tblgen" |
48 |
+ [[ -x "${tblgen}" ]] \ |
49 |
+ || die "${tblgen} not found or usable" |
50 |
mycmakeargs+=( |
51 |
-DCMAKE_CROSSCOMPILING=ON |
52 |
- -DLLVM_TABLEGEN=/usr/bin/llvm-tblgen |
53 |
+ -DLLVM_TABLEGEN="${tblgen}" |
54 |
) |
55 |
fi |