1 |
commit: 770af4c6adfd69343cf13b112a2b72ec4fd633b5 |
2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Jun 1 18:39:12 2018 +0000 |
4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Jun 1 18:39:51 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=770af4c6 |
7 |
|
8 |
scripts/bootstrap-prefix: fix bootstrap on macOS to get past stage2 |
9 |
|
10 |
Recent Xcode have recent enough clang to bootstrap the latest clang, |
11 |
which is installed in a non-standard place. Add some more versions for |
12 |
this and the future. |
13 |
|
14 |
scripts/bootstrap-prefix.sh | 8 +++++--- |
15 |
1 file changed, 5 insertions(+), 3 deletions(-) |
16 |
|
17 |
diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh |
18 |
index 735fd95f0e..75eaf07356 100755 |
19 |
--- a/scripts/bootstrap-prefix.sh |
20 |
+++ b/scripts/bootstrap-prefix.sh |
21 |
@@ -533,7 +533,7 @@ do_tree() { |
22 |
bootstrap_tree() { |
23 |
# RAP uses the latest gentoo main repo snapshot to bootstrap. |
24 |
is-rap && LATEST_TREE_YES=1 |
25 |
- local PV="20180528" |
26 |
+ local PV="20180530" |
27 |
if [[ -n ${LATEST_TREE_YES} ]]; then |
28 |
do_tree "${SNAPSHOT_URL}" portage-latest.tar.bz2 |
29 |
else |
30 |
@@ -1585,7 +1585,9 @@ bootstrap_stage2() { |
31 |
# we're in a cross-ish situation (at least according to |
32 |
# multilib.eclass -- can't blame it at this point really) |
33 |
# do it ourselves here to make the bootstrap continue |
34 |
- ( cd "${ROOT}"/tmp/usr/bin && ln -s clang ${CHOST}-clang && ln -s clang++ ${CHOST}-clang++ ) |
35 |
+ if [[ -x "${ROOT}"/tmp/usr/bin/${CHOST}-clang ]] ; then |
36 |
+ ( cd "${ROOT}"/tmp/usr/bin && ln -s clang ${CHOST}-clang && ln -s clang++ ${CHOST}-clang++ ) |
37 |
+ fi |
38 |
elif ! is-rap ; then |
39 |
# make sure the EPREFIX gcc shared libraries are there |
40 |
mkdir -p "${ROOT}"/usr/${CHOST}/lib/gcc |
41 |
@@ -1634,7 +1636,7 @@ bootstrap_stage3() { |
42 |
# stage3 tools should be used first. |
43 |
# PORTAGE_TMPDIR, EMERGE_LOG_DIR, FEATURES=force-prefix are |
44 |
# needed with host portage. |
45 |
- PREROOTPATH="${ROOT}"$(echo /{,tmp/}{usr/,}{,lib/llvm/5/}{s,}bin | sed "s, ,:${ROOT},g") \ |
46 |
+ PREROOTPATH="${ROOT}"$(echo /{,tmp/}{usr/,}{,lib/llvm/{10,9,8,7,6,5}/}{s,}bin | sed "s, ,:${ROOT},g") \ |
47 |
EPREFIX="${ROOT}" PORTAGE_TMPDIR="${PORTAGE_TMPDIR}" \ |
48 |
FEATURES="${FEATURES} force-prefix" \ |
49 |
EMERGE_LOG_DIR="${ROOT}"/var/log \ |