svn commit: r325243 - in head: . gnu/usr.bin/cc/cc_tools

[Bryan Drewery]

Author: bdrewery
Date: Tue Oct 31 19:02:05 2017
New Revision: 325243
URL: https://svnweb.freebsd.org/changeset/base/325243

Log:
  build-tools: De-special-case the gcc tools build.
  
  It merely wanted to use 'all' rather than 'build-tools' so just
  add a build-tools target to the Makefile.
  
  MFC after:	2 weeks
  Sponsored by:	Dell EMC Isilon

Modified:
  head/Makefile.inc1
  head/gnu/usr.bin/cc/cc_tools/Makefile

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Tue Oct 31 18:22:21 2017	(r325242)
+++ head/Makefile.inc1	Tue Oct 31 19:02:05 2017	(r325243)
@@ -1986,21 +1986,13 @@ _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}; \
 		if [ -z "${NO_OBJ}" ]; then ${MAKE} DIRPRFX=${_tool}/ obj; fi; \
 		${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
 

Modified: head/gnu/usr.bin/cc/cc_tools/Makefile
==============================================================================
--- head/gnu/usr.bin/cc/cc_tools/Makefile	Tue Oct 31 18:22:21 2017	(r325242)
+++ head/gnu/usr.bin/cc/cc_tools/Makefile	Tue Oct 31 19:02:05 2017	(r325243)
@@ -391,6 +391,7 @@ GNTOOLS+=	genattr genattrtab genautomata gencodes genc
 
 ${GNTOOLS:C,$,.o,} ${GNTOOLS}: ${BUILD_TOOLS_META}
 all: ${GNTOOLS} ${GENSRCS} ${GENONLY}
+build-tools: all
 beforedepend: ${GENONLY}
 
 #