@@ -176,38 +176,36 @@ configure_toolchain() {
176
176
* darwin* :1)
177
177
einfo " Triggering Darwin with GCC toolchain"
178
178
compiler_stage1+=" sys-apps/darwin-miscutils"
179
+ compiler_stage1+=" sys-devel/gcc"
180
+ # recent binutils-apple are hard to build (C++11 features,
181
+ # and cmake build system) so avoid going there, the system
182
+ # ld on machines with compiler that supports C11 is good
183
+ # enough to bring us to stage3, after which the @system set
184
+ # will take care of the rest
185
+ linker=" sys-devel/native-cctools"
186
+
179
187
local ccvers=" $( unset CHOST; ${CC} --version 2> /dev/null) "
180
- local isgcc=
181
188
case " ${ccvers} " in
182
189
* " (GCC) " [1-9]* |" gcc (" * " ) " [1-9]* )
183
190
local cvers=" ${ccvers#* )} " ; cvers=" ${cvers%% .* } "
184
191
# GCC-5 has C11 see above
185
192
if [[ ${ccvers} -ge 5 ]] ; then
186
- linker=" =sys-devel/binutils-apple-3.2.6"
187
- isgcc=true
193
+ : # ok!
188
194
else
195
+ # FIXME: should probably stage1 bootstrap GCC-5
196
+ # or something
189
197
eerror " compiler ${ccvers} is too old: ${cvers} < 5"
190
198
eerror " you need a C11/C++11 compiler to bootstrap"
191
199
fi
192
200
;;
193
201
* " Apple clang version " * |* " Apple LLVM version " * )
194
- # recent binutils-apple are hard to build (C++11
195
- # features, and cmake build system) so avoid going
196
- # there, the system ld is good enough to bring us to
197
- # stage3, after which the @system set will take care of
198
- # the rest
199
- linker=sys-devel/native-cctools
202
+ : # ok!
200
203
;;
201
204
* )
202
205
eerror " unknown compiler: ${ccvers} "
203
206
return 1
204
207
;;
205
208
esac
206
- # current compiler (gcc-12) requires C++11, which is
207
- # available since 4.8, but we don't have versions in the
208
- # tree any more to bootstrap up to this -- so fail
209
- # FIXME: should probably stage1 bootstrap GCC-5 or something
210
- compiler_stage1+=" sys-devel/gcc"
211
209
;;
212
210
* -darwin* )
213
211
einfo " Triggering Darwin with LLVM/Clang toolchain"
0 commit comments