Skip to content

Commit 085211f

Browse files
committed
scripts/bootstrap-prefix: drop bits that assume we don't have a C++ compiler
The situation where we bootstrap with a non-C++ compiler is long gone. Closes: https://bugs.gentoo.org/803551 Signed-off-by: Fabian Groffen <[email protected]>
1 parent b162980 commit 085211f

File tree

1 file changed

+0
-17
lines changed

1 file changed

+0
-17
lines changed

scripts/bootstrap-prefix.sh

-17
Original file line numberDiff line numberDiff line change
@@ -474,10 +474,6 @@ bootstrap_profile() {
474474
# Disable bootstrapping libcxx* with libunwind
475475
sys-libs/libcxxabi -libunwind
476476
sys-libs/libcxx -libunwind
477-
# Most binary Linux distributions seem to fancy toolchains that
478-
# do not do c++ support (need to install a separate package).
479-
sys-libs/ncurses -cxx
480-
sys-devel/binutils -cxx
481477
EOF
482478

483479
# On Darwin we might need this to bootstrap the compiler, since
@@ -487,19 +483,6 @@ bootstrap_profile() {
487483
# For Darwin bootstraps
488484
sys-devel/native-cctools
489485
EOF
490-
491-
# Strange enough, -cxx causes wrong libtool config on Cygwin,
492-
# but we require a C++ compiler there anyway - so just use it.
493-
cat >> "${ROOT}"/etc/portage/make.profile/package.use <<-EOF
494-
# gmp has cxx flag enabled by default. When dealing with a host
495-
# compiler without cxx support this causes configure failure.
496-
# In addition, The stage2 g++ is only for compiling stage3 compiler,
497-
# because the host libstdc++.so runtime may be not compatible and
498-
# stage2 libstdc++.so might conflict with that of stage3. The
499-
# trade-off is just not to use cxx.
500-
dev-libs/gmp -cxx
501-
sys-devel/binutils -gold
502-
EOF
503486
}
504487

505488
do_tree() {

0 commit comments

Comments
 (0)