[gentoo-dev] [PATCH 3/4] llvm.eclass: Do not prepend /usr/bin to PATH, #622866

[Michał Górny]

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

diff --git a/eclass/llvm.eclass b/eclass/llvm.eclass
index 2aeba9c8ae39..73af88e44b8e 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.13.2