| 1 |
commit: 597a517ce67de88f63ae156830d9708572b9f5b1 |
| 2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Dec 31 17:27:12 2020 +0000 |
| 4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Dec 31 17:27:12 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=597a517c |
| 7 |
|
| 8 |
scripts/bootstrap-prefix: adjust LLVM hacks |
| 9 |
|
| 10 |
- set PREROOTPATH for a version that is currently in tree |
| 11 |
- drop obsolete hack for llvm-nm |
| 12 |
|
| 13 |
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> |
| 14 |
|
| 15 |
scripts/bootstrap-prefix.sh | 9 +-------- |
| 16 |
1 file changed, 1 insertion(+), 8 deletions(-) |
| 17 |
|
| 18 |
diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh |
| 19 |
index 4394e131aa..fd8a343dae 100755 |
| 20 |
--- a/scripts/bootstrap-prefix.sh |
| 21 |
+++ b/scripts/bootstrap-prefix.sh |
| 22 |
@@ -1974,7 +1974,7 @@ bootstrap_stage3() { |
| 23 |
# (CBUILD, BDEPEND) and with the system being built |
| 24 |
# (CHOST, RDEPEND). To correctly bootstrap stage3, |
| 25 |
# PORTAGE_OVERRIDE_EPREFIX as BROOT is needed. |
| 26 |
- PREROOTPATH="${ROOT}"$(echo /{,tmp/}{usr/,}{,lib/llvm/{10,9,8,7,6,5}/}{s,}bin | sed "s, ,:${ROOT},g") \ |
| 27 |
+ PREROOTPATH="${ROOT}"$(echo /{,tmp/}{usr/,}{,lib/llvm/{12,11,10}/}{s,}bin | sed "s, ,:${ROOT},g") \ |
| 28 |
EPREFIX="${ROOT}" PORTAGE_TMPDIR="${PORTAGE_TMPDIR}" \ |
| 29 |
FEATURES="${FEATURES} force-prefix" \ |
| 30 |
EMERGE_LOG_DIR="${ROOT}"/var/log \ |
| 31 |
@@ -2140,13 +2140,6 @@ bootstrap_stage3() { |
| 32 |
# now we have the compiler right there |
| 33 |
unset CXX CPPFLAGS LDFLAGS |
| 34 |
|
| 35 |
- # On Darwin we have llvm-3.5 at this point, which provides nm. |
| 36 |
- # However for some reason this nm doesn't quite get it on newer |
| 37 |
- # platforms at least, resulting in bugs like #598336. To cater for |
| 38 |
- # that, get rid of this nm and rely on the host one at this stage |
| 39 |
- [[ ${CHOST} == *-darwin* ]] && \ |
| 40 |
- rm -f "${ROOT}"{,/tmp}/usr/bin/{,${CHOST}-}nm |
| 41 |
- |
| 42 |
rm -f "${ROOT}"/etc/ld.so.conf.d/stage2.conf |
| 43 |
|
| 44 |
# need special care, it depends on texinfo, #717786 |
Archives