| 1 |
commit: dae1cff11a36860ac0ddd1ae18cd02daec894c8a |
| 2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jan 2 16:26:54 2018 +0000 |
| 4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jan 2 16:26:54 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=dae1cff1 |
| 7 |
|
| 8 |
scripts/bootstrap-prefix.sh: change Darwin bootstrap to use clang5 |
| 9 |
|
| 10 |
changes by Michael Weiser |
| 11 |
|
| 12 |
Bug: https://bugs.gentoo.org/642656 |
| 13 |
|
| 14 |
scripts/bootstrap-prefix.sh | 25 +++++++++++++------------ |
| 15 |
1 file changed, 13 insertions(+), 12 deletions(-) |
| 16 |
|
| 17 |
diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh |
| 18 |
index 5c7ec7bd45..6b928c2f83 100755 |
| 19 |
--- a/scripts/bootstrap-prefix.sh |
| 20 |
+++ b/scripts/bootstrap-prefix.sh |
| 21 |
@@ -178,14 +178,6 @@ configure_toolchain() { |
| 22 |
) |
| 23 |
esac |
| 24 |
|
| 25 |
- # unfortunately, gmp needs c++, thus libcxx, so have to drag |
| 26 |
- # it in early (gmp is necessary for >3.5) |
| 27 |
- local cdep="3.5.9999" |
| 28 |
- local libcxx=" |
| 29 |
- <sys-libs/libcxx-headers-${cdep} |
| 30 |
- <sys-libs/libcxxabi-${cdep} |
| 31 |
- <sys-libs/libcxx-${cdep}" |
| 32 |
- |
| 33 |
CC=gcc |
| 34 |
CXX=g++ |
| 35 |
llvm_deps=" |
| 36 |
@@ -219,7 +211,8 @@ configure_toolchain() { |
| 37 |
${llvm_deps} |
| 38 |
sys-devel/llvm |
| 39 |
sys-devel/clang |
| 40 |
- ${libcxx}" |
| 41 |
+ sys-libs/libcxxabi |
| 42 |
+ sys-libs/libcxx" |
| 43 |
;; |
| 44 |
esac |
| 45 |
CC=clang |
| 46 |
@@ -249,12 +242,17 @@ configure_toolchain() { |
| 47 |
if [[ ${mycc} == gcc ]] ; then |
| 48 |
# The deps for 3.6+ are too high (cmake, ninja, python) so |
| 49 |
# we have to install this with an intermediate |
| 50 |
+ # unfortunately, gmp needs c++, thus libcxx, so have to drag |
| 51 |
+ # it in early (gmp is necessary for >3.5) |
| 52 |
# we always have to bootstrap with 3.4 for else we'd need |
| 53 |
# libcxx, which only compiles with clang |
| 54 |
+ local cdep="3.5.9999" |
| 55 |
compiler_stage1+=" |
| 56 |
dev-libs/libffi |
| 57 |
<sys-devel/llvm-3.5 |
| 58 |
- ${libcxx} |
| 59 |
+ <sys-libs/libcxx-headers-${cdep} |
| 60 |
+ <sys-libs/libcxxabi-${cdep} |
| 61 |
+ <sys-libs/libcxx-${cdep} |
| 62 |
<sys-devel/llvm-${cdep} |
| 63 |
<sys-devel/clang-${cdep}" |
| 64 |
fi |
| 65 |
@@ -263,7 +261,8 @@ configure_toolchain() { |
| 66 |
sys-libs/csu |
| 67 |
dev-libs/libffi |
| 68 |
${llvm_deps} |
| 69 |
- ${libcxx} |
| 70 |
+ sys-libs/libcxxabi |
| 71 |
+ sys-libs/libcxx |
| 72 |
sys-devel/llvm |
| 73 |
sys-devel/clang" |
| 74 |
;; |
| 75 |
@@ -1453,6 +1452,7 @@ bootstrap_stage2() { |
| 76 |
|
| 77 |
BOOTSTRAP_RAP_STAGE2=yes \ |
| 78 |
EXTRA_ECONF="--disable-bootstrap" \ |
| 79 |
+ MYCMAKEARGS="-DCMAKE_USE_SYSTEM_LIBRARY_LIBUV=OFF" \ |
| 80 |
GCC_MAKE_TARGET=all \ |
| 81 |
TPREFIX="${ROOT}" \ |
| 82 |
PYTHON_COMPAT_OVERRIDE=python2.7 \ |
| 83 |
@@ -1520,7 +1520,7 @@ bootstrap_stage3() { |
| 84 |
# stage3 tools should be used first. |
| 85 |
# PORTAGE_TMPDIR, EMERGE_LOG_DIR, FEATURES=force-prefix are |
| 86 |
# needed with host portage. |
| 87 |
- PREROOTPATH="${ROOT}"$(echo /{,tmp/}{,usr/}{s,}bin | sed "s, ,:${ROOT},g") \ |
| 88 |
+ PREROOTPATH="${ROOT}"$(echo /{,tmp/}{,usr/}{,lib/llvm/5/}{s,}bin | sed "s, ,:${ROOT},g") \ |
| 89 |
EPREFIX="${ROOT}" PORTAGE_TMPDIR="${PORTAGE_TMPDIR}" \ |
| 90 |
FEATURES="${FEATURES} force-prefix" \ |
| 91 |
EMERGE_LOG_DIR="${ROOT}"/var/log \ |
| 92 |
@@ -1604,6 +1604,7 @@ bootstrap_stage3() { |
| 93 |
RAP_DLINKER=$(echo "${ROOT}"/$(get_libdir)/ld*.so.[0-9]) |
| 94 |
# try to get ourself out of the mudd, bug #575324 |
| 95 |
EXTRA_ECONF="--disable-compiler-version-checks $(rapx --disable-lto)" \ |
| 96 |
+ MYCMAKEARGS="-DCMAKE_USE_SYSTEM_LIBRARY_LIBUV=OFF" \ |
| 97 |
LDFLAGS="${LDFLAGS} $(rapx -Wl,--dynamic-linker=${RAP_DLINKER})" \ |
| 98 |
PYTHON_COMPAT_OVERRIDE=python2.7 \ |
| 99 |
emerge_pkgs --nodeps ${compiler} || return 1 |
Archives