summaryrefslogtreecommitdiffstats
path: root/Makefile.inc1
diff options
context:
space:
mode:
authorpeter <peter@FreeBSD.org>2013-05-28 21:29:05 +0000
committerpeter <peter@FreeBSD.org>2013-05-28 21:29:05 +0000
commit8f9d1da1591d6c7bf032224aba042ad4d6758213 (patch)
treeef53ed402105d66be514e276ed3144feb040803c /Makefile.inc1
parent16e12aa3c20ce3c5454147fed0cfba2f3afb18ff (diff)
downloadFreeBSD-src-8f9d1da1591d6c7bf032224aba042ad4d6758213.zip
FreeBSD-src-8f9d1da1591d6c7bf032224aba042ad4d6758213.tar.gz
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
Diffstat (limited to 'Makefile.inc1')
-rw-r--r--Makefile.inc111
1 files changed, 2 insertions, 9 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1
index 75cede0..99e6ed2 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -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 "--------------------------------------------------------------"
OpenPOWER on IntegriCloud