Make sure to not yet build the GNU C++, but still allow

for the C++ progs to be built with e.g. an old compiler,
CXX=/usr/bin/c++, for the time being.

Makefile.inc1

@@ -659,10 +659,6 @@ cross-tools:
 hierarchy:
 	cd ${.CURDIR}/etc;		${MAKE} distrib-dirs
 
-.if ${CXX} == "c++"
-NO_CXX=	yes
-.endif
-
 #
 # libraries - build all libraries, and install them under ${DESTDIR}.
 #

gnu/lib/Makefile

@@ -8,13 +8,11 @@ SUBDIR+= libgcc_r
 .endif
 .endif
 
-.if ${CXX:T} == "c++"
-NO_CXX=	yes
-.endif
-
+.if notyet
 .if !defined(NO_CXX)
 SUBDIR+= libsupc++ libstdc++
 .endif
+.endif
 
 .if !defined(NO_OBJC)
 SUBDIR+= libobjc

gnu/usr.bin/Makefile

@@ -3,7 +3,7 @@
 SUBDIR= awk bc binutils cc cpio dc dialog diff diff3 \
 	grep gzip man patch ptx rcs sdiff send-pr sort tar texinfo
 
-.if ${CXX:T} != "c++"
+.if ${CXX} != "c++"
 SUBDIR+=gperf groff
 .endif
 

gnu/usr.bin/cc/Makefile

@@ -9,12 +9,14 @@ SUBDIR= cc_fbsd cc_tools cc_int cc cc1 cpp0 protoize tradcpp0
 SUBDIR+= cpp
 .endif
 
+.if notyet
 .if !defined(NO_CXX)
 SUBDIR+= cc1plus c++ c++filt doc
 .if !defined(NO_COLLECT2)
 #SUBDIR+= collect2
 .endif
 .endif
+.endif
 
 .if !defined(NO_OBJC)
 SUBDIR+= cc1obj