[gentoo-commits] repo/gentoo:master commit in: sys-devel/llvm/

[Alexis Ballier]

commit:     a564bdff02df5a878ddf90988538a457596443e1
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 19 08:52:31 2017 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Mon Jun 19 08:52:49 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a564bdff

sys-devel/llvm: Fix path to llvm-tblgen when cross compiling.

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 sys-devel/llvm/llvm-4.0.0-r2.ebuild | 7 ++++---
 sys-devel/llvm/llvm-9999.ebuild     | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/sys-devel/llvm/llvm-4.0.0-r2.ebuild 
b/sys-devel/llvm/llvm-4.0.0-r2.ebuild
index 86ec2572ef8..e599e21fc6e 100644
--- a/sys-devel/llvm/llvm-4.0.0-r2.ebuild
+++ b/sys-devel/llvm/llvm-4.0.0-r2.ebuild
@@ -155,11 +155,12 @@ multilib_src_configure() {
        fi
 
        if tc-is-cross-compiler; then
-               [[ -x "/usr/bin/llvm-tblgen" ]] \
-                       || die "/usr/bin/llvm-tblgen not found or usable"
+               local tblgen="${EPREFIX}/usr/lib/llvm/${SLOT}/bin/llvm-tblgen"
+               [[ -x "${tblgen}" ]] \
+                       || die "${tblgen} not found or usable"
                mycmakeargs+=(
                        -DCMAKE_CROSSCOMPILING=ON
-                       -DLLVM_TABLEGEN=/usr/bin/llvm-tblgen
+                       -DLLVM_TABLEGEN="${tblgen}"
                )
        fi
 

diff --git a/sys-devel/llvm/llvm-9999.ebuild b/sys-devel/llvm/llvm-9999.ebuild
index 545cfbbcb49..99121e917a0 100644
--- a/sys-devel/llvm/llvm-9999.ebuild
+++ b/sys-devel/llvm/llvm-9999.ebuild
@@ -154,11 +154,12 @@ multilib_src_configure() {
        fi
 
        if tc-is-cross-compiler; then
-               [[ -x "/usr/bin/llvm-tblgen" ]] \
-                       || die "/usr/bin/llvm-tblgen not found or usable"
+               local tblgen="${EPREFIX}/usr/lib/llvm/${SLOT}/bin/llvm-tblgen"
+               [[ -x "${tblgen}" ]] \
+                       || die "${tblgen} not found or usable"
                mycmakeargs+=(
                        -DCMAKE_CROSSCOMPILING=ON
-                       -DLLVM_TABLEGEN=/usr/bin/llvm-tblgen
+                       -DLLVM_TABLEGEN="${tblgen}"
                )
        fi