| 1 |
commit: 070c3940f73db48b514d00d87442aeaff6cc0211 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Jun 30 21:27:39 2017 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Aug 12 21:21:30 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=070c3940 |
| 7 |
|
| 8 |
llvm.eclass: Do not prepend /usr/bin to PATH, #622866 |
| 9 |
|
| 10 |
eclass/llvm.eclass | 8 +++++++- |
| 11 |
1 file changed, 7 insertions(+), 1 deletion(-) |
| 12 |
|
| 13 |
diff --git a/eclass/llvm.eclass b/eclass/llvm.eclass |
| 14 |
index fc09a7d9598..d9518fe6226 100644 |
| 15 |
--- a/eclass/llvm.eclass |
| 16 |
+++ b/eclass/llvm.eclass |
| 17 |
@@ -159,7 +159,13 @@ llvm_pkg_setup() { |
| 18 |
debug-print-function ${FUNCNAME} "${@}" |
| 19 |
|
| 20 |
if [[ ${MERGE_TYPE} != binary ]]; then |
| 21 |
- export PATH=$(get_llvm_prefix ${LLVM_MAX_SLOT})/bin:${PATH} |
| 22 |
+ local llvm_prefix=$(get_llvm_prefix "${LLVM_MAX_SLOT}") |
| 23 |
+ |
| 24 |
+ # do not prepend /usr/bin, it's not necessary and breaks other |
| 25 |
+ # prepends, https://bugs.gentoo.org/622866 |
| 26 |
+ if [[ ${llvm_prefix} != ${EPREFIX}/usr ]]; then |
| 27 |
+ export PATH=${llvm_prefix}/bin:${PATH} |
| 28 |
+ fi |
| 29 |
fi |
| 30 |
} |
Archives