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