diff --git a/Makefile.inc1 b/Makefile.inc1
index 41acea74c61c..53bff0771b20 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -1986,7 +1986,8 @@ _tcsh=bin/csh
     lib/libmagic \
     usr.bin/mkesdb_static \
     usr.bin/mkcsmapper_static \
-    usr.bin/vi/catalog
+    usr.bin/vi/catalog \
+    ${_gcc_tools}
 build-tools_${_tool}: .PHONY
 	${_+_}@${ECHODIR} "===> ${_tool} (obj,build-tools)"; \
 		cd ${.CURDIR}/${_tool}; \
@@ -1994,15 +1995,6 @@ build-tools_${_tool}: .PHONY
 		${MAKE} DIRPRFX=${_tool}/ build-tools
 build-tools: build-tools_${_tool}
 .endfor
-.for _tool in \
-    ${_gcc_tools}
-build-tools_${_tool}: .PHONY
-	${_+_}@${ECHODIR} "===> ${_tool} (obj,all)"; \
-		cd ${.CURDIR}/${_tool}; \
-		if [ -z "${NO_OBJ}" ]; then ${MAKE} DIRPRFX=${_tool}/ obj; fi; \
-		${MAKE} DIRPRFX=${_tool}/ all
-build-tools: build-tools_${_tool}
-.endfor
 
 #
 # kernel-tools: Build kernel-building tools
diff --git a/gnu/usr.bin/cc/cc_tools/Makefile b/gnu/usr.bin/cc/cc_tools/Makefile
index 47870357f269..adc101b299f3 100644
--- a/gnu/usr.bin/cc/cc_tools/Makefile
+++ b/gnu/usr.bin/cc/cc_tools/Makefile
@@ -391,6 +391,7 @@ GNTOOLS+=	genattr genattrtab genautomata gencodes gencheck genchecksum \
 
 ${GNTOOLS:C,$,.o,} ${GNTOOLS}: ${BUILD_TOOLS_META}
 all: ${GNTOOLS} ${GENSRCS} ${GENONLY}
+build-tools: all
 beforedepend: ${GENONLY}
 
 #