summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2017-06-30 23:27:39 +0200
committerMichał Górny <mgorny@gentoo.org>2017-08-12 23:21:30 +0200
commit070c3940f73db48b514d00d87442aeaff6cc0211 (patch)
treef3e7ac33c551c64c6fd2bda4814ab5561fd8eca1 /eclass
parentllvm.eclass: Support checking LLVM deps via llvm_check_deps() (diff)
downloadgentoo-070c3940f73db48b514d00d87442aeaff6cc0211.tar.gz
gentoo-070c3940f73db48b514d00d87442aeaff6cc0211.tar.bz2
gentoo-070c3940f73db48b514d00d87442aeaff6cc0211.zip
llvm.eclass: Do not prepend /usr/bin to PATH, #622866
Diffstat (limited to 'eclass')
-rw-r--r--eclass/llvm.eclass8
1 files changed, 7 insertions, 1 deletions
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
}