svn commit: r251074 - head

[Peter Wemm]

Author: peter
Date: Tue May 28 21:29:05 2013
New Revision: 251074
URL: http://svnweb.freebsd.org/changeset/base/251074

Log:
  Temporarily revert r251058 - it breaks documented use of makeoptions
  including the tinderbox.
  
   http://tinderbox.freebsd.org/tinderbox-head-build-HEAD-i386-i386.full
   make: don't know how to make modules-all. Stop
   make: stopped in /obj/i386.i386/src/sys/PAE
   *** Error code 2

Modified:
  head/Makefile.inc1

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Tue May 28 21:25:28 2013	(r251073)
+++ head/Makefile.inc1	Tue May 28 21:29:05 2013	(r251074)
@@ -983,16 +983,9 @@ buildkernel:
 .endif
 	@echo
 	@echo "--------------------------------------------------------------"
-	@echo ">>> stage 3.2: building the kernel"
+	@echo ">>> stage 3.2: building everything"
 	@echo "--------------------------------------------------------------"
-	cd ${KRNLOBJDIR}/${_kernel}; ${KMAKE} kernel-all -DNO_MODULES_OBJ
-	@echo
-.if !defined(MODULES_WITH_WORLD) && !defined(NO_MODULES) && exists(${KERNSRCDIR}/modules)
-	@echo "--------------------------------------------------------------"
-	@echo ">>> stage 3.3: building the modules"
-	@echo "--------------------------------------------------------------"
-	cd ${KRNLOBJDIR}/${_kernel}; ${KMAKE} modules-all -DNO_MODULES_OBJ
-.endif
+	cd ${KRNLOBJDIR}/${_kernel}; ${KMAKE} all -DNO_MODULES_OBJ
 	@echo "--------------------------------------------------------------"
 	@echo ">>> Kernel build for ${_kernel} completed on `LC_ALL=C date`"
 	@echo "--------------------------------------------------------------"