--- Makefile.in.orig	Mon Feb 22 17:30:56 1999
+++ Makefile.in	Sun Mar 28 15:03:18 1999
@@ -154,7 +154,7 @@
 
 # This is set by the configure script to the list of directories which
 # should be built using the target tools.
-TARGET_CONFIGDIRS = libiberty libgloss newlib libio librx libstdc++ libg++ libf2c winsup
+TARGET_CONFIGDIRS = libgloss newlib
 
 # Target libraries are put under this directory:
 # Changed by configure to $(target_alias) if cross.
@@ -1358,10 +1358,10 @@
 	@r=`pwd`; export r; \
 	s=`cd $(srcdir); pwd`; export s; \
 	$(SET_LIB_PATH) \
-	echo "Building the C and C++ compiler"; \
-	cd gcc; $(MAKE) $(GCC_FLAGS_TO_PASS) LANGUAGES="c c++"
+	echo "Building the C compiler"; \
+	cd gcc; $(MAKE) $(GCC_FLAGS_TO_PASS) LANGUAGES="c"
 	@echo "Building runtime libraries"; \
-	$(MAKE) all LANGUAGES="c c++"
+	$(MAKE) all LANGUAGES="c"
 
 .PHONY: check-gcc
 check-gcc:
@@ -1391,7 +1391,7 @@
 	  r=`pwd`; export r; \
 	  s=`cd $(srcdir); pwd`; export s; \
 	  $(SET_LIB_PATH) \
-	  (cd gcc; $(MAKE) $(GCC_FLAGS_TO_PASS) LANGUAGES="c c++" install); \
+	  (cd gcc; $(MAKE) $(GCC_FLAGS_TO_PASS) LANGUAGES="c" install); \
 	else \
 	  true; \
 	fi
