From 070c3940f73db48b514d00d87442aeaff6cc0211 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
Date: Fri, 30 Jun 2017 23:27:39 +0200
Subject: [PATCH] llvm.eclass: Do not prepend /usr/bin to PATH, #622866

---
 eclass/llvm.eclass | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/eclass/llvm.eclass b/eclass/llvm.eclass
index fc09a7d9598d..d9518fe62266 100644
--- a/eclass/llvm.eclass
+++ b/eclass/llvm.eclass
@@ -159,7 +159,13 @@ llvm_pkg_setup() {
 	debug-print-function ${FUNCNAME} "${@}"
 
 	if [[ ${MERGE_TYPE} != binary ]]; then
-		export PATH=$(get_llvm_prefix ${LLVM_MAX_SLOT})/bin:${PATH}
+		local llvm_prefix=$(get_llvm_prefix "${LLVM_MAX_SLOT}")
+
+		# do not prepend /usr/bin, it's not necessary and breaks other
+		# prepends, https://bugs.gentoo.org/622866
+		if [[ ${llvm_prefix} != ${EPREFIX}/usr ]]; then
+			export PATH=${llvm_prefix}/bin:${PATH}
+		fi
 	fi
 }
 
-- 
2.26.2