diff --git a/Makefile.inc1 b/Makefile.inc1
index 7030b917e6d..64a144cb030 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -317,15 +317,23 @@ everything:
 
 
 WMAKE_TGTS=
-.if !defined(SUBDIR_OVERRIDE)
+.if !defined(SUBDIR_OVERRIDE) && !defined(X_QUICK)
 WMAKE_TGTS+=	_worldtmp _bootstrap-tools
 .endif
+.if !defined(X_QUICK)
 WMAKE_TGTS+=	_cleanobj _obj _build-tools
-.if !defined(SUBDIR_OVERRIDE)
+.endif
+.if !defined(SUBDIR_OVERRIDE) && !defined(X_QUICK)
 WMAKE_TGTS+=	_cross-tools
 .endif
 WMAKE_TGTS+=	_includes _libraries _depend everything
 
+.for __target in ${WMAKE_TGTS}
+.if defined(NO${__target})
+WMAKE_TGTS:=	${WMAKE_TGTS:N${__target}}
+.endif
+.endfor
+
 buildworld: ${WMAKE_TGTS}
 .ORDER: ${WMAKE_TGTS}
 
@@ -572,8 +580,8 @@ installmost:
 .if exists(${.CURDIR}/games) && !defined(NOGAMES)
 _strfile=	games/fortune/strfile
 .endif
-.if ${CXX} != "c++"
-_cxx_consumers=	gnu/usr.bin/gperf gnu/usr.bin/groff
+.if ${CXX:T} != "c++"
+_cxx_consumers=	gnu/usr.bin/groff
 .endif
 
 bootstrap-tools:
diff --git a/gnu/usr.bin/Makefile b/gnu/usr.bin/Makefile
index 430d3e05696..44a83b99a17 100644
--- a/gnu/usr.bin/Makefile
+++ b/gnu/usr.bin/Makefile
@@ -3,8 +3,8 @@
 SUBDIR= awk bc binutils cc cpio dc dialog diff diff3 \
 	grep gzip man patch ptx rcs sdiff send-pr sort tar texinfo
 
-.if ${CXX} != "c++"
-SUBDIR+=gperf groff
+.if ${CXX:T} != "c++"
+SUBDIR+=groff
 .endif
 
 .if !defined(NO_CVS)