From: Alexis Ballier <aballier@gentoo.org>
Date: Mon, 19 Jun 2017 08:52:31 +0000 (+0200)
Subject: sys-devel/llvm: Fix path to llvm-tblgen when cross compiling.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a564bdff02df5a878ddf90988538a457596443e1;p=gentoo.git

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 86ec2572ef86..e599e21fc6e1 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 545cfbbcb49c..99121e917a09 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