| 1 |
commit: 4e6bc8b4d40885216cef434386f30ab95f43ff53 |
| 2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Dec 31 18:36:04 2020 +0000 |
| 4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Dec 31 18:36:04 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=4e6bc8b4 |
| 7 |
|
| 8 |
scripts/bootstrap-prefix: drop obsolete Darwin code paths |
| 9 |
|
| 10 |
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> |
| 11 |
|
| 12 |
scripts/bootstrap-prefix.sh | 66 ++------------------------------------------- |
| 13 |
1 file changed, 2 insertions(+), 64 deletions(-) |
| 14 |
|
| 15 |
diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh |
| 16 |
index 8dae1b5944..c383f0f11a 100755 |
| 17 |
--- a/scripts/bootstrap-prefix.sh |
| 18 |
+++ b/scripts/bootstrap-prefix.sh |
| 19 |
@@ -224,14 +224,10 @@ configure_toolchain() { |
| 20 |
compiler_stage1="sys-apps/darwin-miscutils sys-libs/csu" |
| 21 |
compiler_type="clang" |
| 22 |
local ccvers="$( (unset CHOST; gcc --version 2>/dev/null) )" |
| 23 |
- local mycc= |
| 24 |
local llvm_deps="dev-util/ninja sys-devel/gnuconfig" |
| 25 |
case "${ccvers}" in |
| 26 |
- *"Apple clang version "*) |
| 27 |
- vers=${ccvers#*Apple clang version } |
| 28 |
- vers=${vers% (clang-*} |
| 29 |
+ *"Apple clang version "*|*"Apple LLVM version "*) |
| 30 |
# this is Clang, recent enough to compile recent clang |
| 31 |
- mycc=clang |
| 32 |
compiler_stage1+=" |
| 33 |
${llvm_deps} |
| 34 |
sys-libs/libcxxabi |
| 35 |
@@ -247,57 +243,12 @@ configure_toolchain() { |
| 36 |
# from system set |
| 37 |
linker=sys-devel/native-cctools |
| 38 |
;; |
| 39 |
- *"Apple LLVM version "*) |
| 40 |
- vers=${ccvers#*Apple LLVM version } |
| 41 |
- vers=${vers% (clang-*} |
| 42 |
- # let's assume that >=llvm-3.6 is able to compile |
| 43 |
- # libcxx, so select the matching Apple versions, see |
| 44 |
- # https://gist.github.com/yamaya/2924292 |
| 45 |
- case ${vers} in |
| 46 |
- [345]"."*|"6.0"*) |
| 47 |
- # bleh, old (<llvm-3.6) |
| 48 |
- mycc=gcc |
| 49 |
- ;; |
| 50 |
- *) |
| 51 |
- # newish, try direct bootstrap to recent |
| 52 |
- mycc=clang |
| 53 |
- compiler_stage1+=" |
| 54 |
- ${llvm_deps} |
| 55 |
- sys-libs/libcxxabi |
| 56 |
- sys-libs/libcxx |
| 57 |
- sys-devel/llvm |
| 58 |
- sys-devel/clang |
| 59 |
- " |
| 60 |
- ;; |
| 61 |
- esac |
| 62 |
- CC=clang |
| 63 |
- CXX=clang++ |
| 64 |
- # see above for reasoning |
| 65 |
- linker=sys-devel/native-cctools |
| 66 |
- ;; |
| 67 |
*) |
| 68 |
- eerror "unknown compiler" |
| 69 |
+ eerror "unknown/unsupported compiler" |
| 70 |
return 1 |
| 71 |
;; |
| 72 |
esac |
| 73 |
|
| 74 |
- if [[ ${mycc} == gcc ]] ; then |
| 75 |
- # The deps for 3.6+ are too high (cmake, ninja, python) so |
| 76 |
- # we have to install this with an intermediate |
| 77 |
- # unfortunately, gmp needs c++, thus libcxx, so have to drag |
| 78 |
- # it in early (gmp is necessary for >3.5) |
| 79 |
- # we always have to bootstrap with 3.4 for else we'd need |
| 80 |
- # libcxx, which only compiles with clang |
| 81 |
- local cdep="3.5.9999" |
| 82 |
- compiler_stage1+=" |
| 83 |
- dev-libs/libffi |
| 84 |
- <sys-libs/libcxx-headers-${cdep} |
| 85 |
- <sys-libs/libcxxabi-${cdep} |
| 86 |
- <sys-libs/libcxx-${cdep} |
| 87 |
- <sys-devel/llvm-${cdep} |
| 88 |
- <sys-devel/clang-${cdep}" |
| 89 |
- fi |
| 90 |
- |
| 91 |
compiler=" |
| 92 |
sys-libs/csu |
| 93 |
dev-libs/libffi |
| 94 |
@@ -2121,19 +2072,6 @@ bootstrap_stage3() { |
| 95 |
# in addition, avoid collisions |
| 96 |
rm -Rf "${ROOT}"/tmp/usr/lib/python${PYTHONMAJMIN}/site-packages/clang |
| 97 |
|
| 98 |
- # llvm-3.5 doesn't find C++11 headers/lib by default, make it so |
| 99 |
- if [[ ${CHOST} == *-darwin9 ]] ; then |
| 100 |
- export OVERRIDE_CXXFLAGS="-I${ROOT}/tmp/usr/include/c++/v1 -fPIC" |
| 101 |
- # -fPIC is here because we need it, but the toolchain doesn't |
| 102 |
- # default to it (like for x86_64) |
| 103 |
- export OVERRIDE_CFLAGS="-fPIC" |
| 104 |
- # replace GCC's libstdc++ with libcxx (super hack!) |
| 105 |
- ( cd "${ROOT}"/tmp/usr/lib/gcc/${CHOST}/4.2.1 \ |
| 106 |
- && ! test -e libstdc++.6.0.9.dylib-gcc \ |
| 107 |
- && mv libstdc++.6.0.9.dylib{,-gcc} \ |
| 108 |
- && ln -s ../../../libc++.1.dylib libstdc++.6.0.9.dylib ) |
| 109 |
- fi |
| 110 |
- |
| 111 |
# try to get ourself out of the mudd, bug #575324 |
| 112 |
EXTRA_ECONF="--disable-compiler-version-checks $(rapx '--disable-lto --disable-bootstrap')" \ |
| 113 |
GCC_MAKE_TARGET=$(rapx all) \ |
Archives