scripts/bootstrap-prefix: drop bits that assume we don't have a C++ c…

…ompiler

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]>

scripts/bootstrap-prefix.sh

@@ -474,10 +474,6 @@ bootstrap_profile() {
 	# Disable bootstrapping libcxx* with libunwind
 	sys-libs/libcxxabi -libunwind
 	sys-libs/libcxx -libunwind
-	# Most binary Linux distributions seem to fancy toolchains that
-	# do not do c++ support (need to install a separate package).
-	sys-libs/ncurses -cxx
-	sys-devel/binutils -cxx
 	EOF
 
 	# On Darwin we might need this to bootstrap the compiler, since
@@ -487,19 +483,6 @@ bootstrap_profile() {
 	# For Darwin bootstraps
 	sys-devel/native-cctools
 	EOF
-
-	# Strange enough, -cxx causes wrong libtool config on Cygwin,
-	# but we require a C++ compiler there anyway - so just use it.
-	cat >> "${ROOT}"/etc/portage/make.profile/package.use <<-EOF
-	# gmp has cxx flag enabled by default. When dealing with a host
-	# compiler without cxx support this causes configure failure.
-	# In addition, The stage2 g++ is only for compiling stage3 compiler,
-	# because the host libstdc++.so runtime may be not compatible and
-	# stage2 libstdc++.so might conflict with that of stage3.  The
-	# trade-off is just not to use cxx.
-	dev-libs/gmp -cxx
-	sys-devel/binutils -gold
-	EOF
 }
 
 do_tree() {