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

Package-Manager: Portage-2.3.6, Repoman-2.3.2

diff --git a/sys-devel/llvm/llvm-4.0.0-r2.ebuild b/sys-devel/llvm/llvm-4.0.0-r2.ebuild
index 86ec2572ef86e61073d111a24a7d06fc808c0efd..e599e21fc6e13a7286d9d817e94dcc07cd77237f 100644 (file)
--- 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 545cfbbcb49c13566e44ef72cdffe31d5bdde04a..99121e917a0934100c1b2609d8d647dff407eb2b 100644 (file)
--- 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