Index: stable/4/gnu/usr.bin/cc/Makefile
===================================================================
--- stable/4/gnu/usr.bin/cc/Makefile	(revision 62556)
+++ stable/4/gnu/usr.bin/cc/Makefile	(revision 62557)
@@ -1,16 +1,24 @@
 # $FreeBSD$
 
 # The order of some of these are rather important.  Some depend on previous
 # subdirs.
 
-SUBDIR= cc_fbsd cc_tools cc_int cccp cpp cc1 cc cc1plus c++ c++filt doc
+SUBDIR= cc_fbsd cc_tools cc_int cccp cc1 cc
+
+.if !defined(NO_CPP)
+SUBDIR+= cpp
+.endif
+
+.if !defined(NO_CXX)
+SUBDIR+= cc1plus c++ c++filt doc
+.endif
 
 .if !defined(NO_OBJC)
 SUBDIR+= cc1obj
 .endif
 
 .if !defined(NO_FORTRAN)
 SUBDIR+= f77 f771 f77doc
 .endif
 
 .include <bsd.subdir.mk>