7 files changed, 15 insertions, 4 deletions

diff --git a/etc/defaults/make.conf b/etc/defaults/make.conf
index bbcd54269a16b..7a5a5faebcd7e 100644
--- a/etc/defaults/make.conf
+++ b/etc/defaults/make.conf
@@ -64,6 +64,9 @@
 #NOSHARE=	true	# do not go into the share subdir
 #NOUUCP=	true	# do not build uucp related programs
 #
+# To build sys/modules when building the world (our old way of doing things)
+#MODULES_WITH_WORLD=true	# do not build modules when building kernel
+#
 # To tell the base system that you are using RSAREF (from ports).
 # (This needs revisiting) - it is very likely that this is too
 # heavily tied to USA_RESIDENT==YES.
diff --git a/share/examples/etc/make.conf b/share/examples/etc/make.conf
index bbcd54269a16b..7a5a5faebcd7e 100644
--- a/share/examples/etc/make.conf
+++ b/share/examples/etc/make.conf
@@ -64,6 +64,9 @@
 #NOSHARE=	true	# do not go into the share subdir
 #NOUUCP=	true	# do not build uucp related programs
 #
+# To build sys/modules when building the world (our old way of doing things)
+#MODULES_WITH_WORLD=true	# do not build modules when building kernel
+#
 # To tell the base system that you are using RSAREF (from ports).
 # (This needs revisiting) - it is very likely that this is too
 # heavily tied to USA_RESIDENT==YES.
diff --git a/sys/Makefile b/sys/Makefile
index 14331b3bbfa65..6e3702727c6cd 100644
--- a/sys/Makefile
+++ b/sys/Makefile
@@ -3,6 +3,11 @@
 # The boot loader
 SUBDIR=	boot
 
+# KLD modules build for both a.out and ELF
+.if defined(MODULES_WITH_WORLD)
+SUBDIR+=modules
+.endif
+
 HTAGSFLAGS+= -at `awk -F= '/^RELEASE *=/{release=$2}; END {print "FreeBSD", release, "kernel"}' < conf/newvers.sh`
 
 .include <bsd.subdir.mk>
diff --git a/sys/conf/Makefile.alpha b/sys/conf/Makefile.alpha
index 14b8c4c5f8f4e..eb496c66a99d6 100644
--- a/sys/conf/Makefile.alpha
+++ b/sys/conf/Makefile.alpha
@@ -274,7 +274,7 @@ kernel-reinstall kernel-reinstall.debug:
 	install -c -m 555 -o root -g wheel -fschg \
 		${KERNEL}${.TARGET:S/kernel-reinstall//} ${DESTDIR}/${KERNEL}
 
-.if !defined(NO_MODULES) && exists($S/modules)
+.if !defined(MODULES_WITH_WORLD) && exists($S/modules)
 all:	modules
 depend: modules-depend
 clean:  modules-clean
diff --git a/sys/conf/Makefile.i386 b/sys/conf/Makefile.i386
index 8a93ac67b21f6..8460286780890 100644
--- a/sys/conf/Makefile.i386
+++ b/sys/conf/Makefile.i386
@@ -229,7 +229,7 @@ kernel-reinstall kernel-reinstall.debug:
 	install -c -m 555 -o root -g wheel -fschg \
 		${KERNEL}${.TARGET:S/kernel-reinstall//} ${DESTDIR}/${KERNEL}
 
-.if !defined(NO_MODULES) && exists($S/modules)
+.if !defined(MODULES_WITH_WORLD) && exists($S/modules)
 all:	modules
 depend: modules-depend
 clean:  modules-clean
diff --git a/sys/conf/Makefile.pc98 b/sys/conf/Makefile.pc98
index 79c1ca7bd052f..870d96490b385 100644
--- a/sys/conf/Makefile.pc98
+++ b/sys/conf/Makefile.pc98
@@ -232,7 +232,7 @@ kernel-reinstall kernel-reinstall.debug:
 	install -c -m 555 -o root -g wheel -fschg \
 		${KERNEL}${.TARGET:S/kernel-reinstall//} ${DESTDIR}/${KERNEL}
 
-.if !defined(NO_MODULES) && exists($S/modules)
+.if !defined(MODULES_WITH_WORLD) && exists($S/modules)
 all:	modules
 depend: modules-depend
 clean:  modules-clean
diff --git a/sys/conf/Makefile.powerpc b/sys/conf/Makefile.powerpc
index 8a93ac67b21f6..8460286780890 100644
--- a/sys/conf/Makefile.powerpc
+++ b/sys/conf/Makefile.powerpc
@@ -229,7 +229,7 @@ kernel-reinstall kernel-reinstall.debug:
 	install -c -m 555 -o root -g wheel -fschg \
 		${KERNEL}${.TARGET:S/kernel-reinstall//} ${DESTDIR}/${KERNEL}
 
-.if !defined(NO_MODULES) && exists($S/modules)
+.if !defined(MODULES_WITH_WORLD) && exists($S/modules)
 all:	modules
 depend: modules-depend
 clean:  modules-clean