From f94a3783cff548a87ed576943c2267004058d98e Mon Sep 17 00:00:00 2001
From: "David E. O'Brien" <obrien@FreeBSD.org>
Date: Sat, 17 Jun 2000 10:51:56 +0000
Subject: [PATCH] If "MODULES_WITH_WORLD" is defined, sys/modules will be built
 with the world as was our old way, rather than when building a kernel.

Some people do not like the new way, and the release building still assumes
modules are built with the world.
---
 etc/defaults/make.conf       | 3 +++
 share/examples/etc/make.conf | 3 +++
 sys/Makefile                 | 5 +++++
 sys/conf/Makefile.alpha      | 2 +-
 sys/conf/Makefile.i386       | 2 +-
 sys/conf/Makefile.pc98       | 2 +-
 sys/conf/Makefile.powerpc    | 2 +-
 7 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/etc/defaults/make.conf b/etc/defaults/make.conf
index bbcd54269a16..7a5a5faebcd7 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 bbcd54269a16..7a5a5faebcd7 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 14331b3bbfa6..6e3702727c6c 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 14b8c4c5f8f4..eb496c66a99d 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 8a93ac67b21f..846028678089 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 79c1ca7bd052..870d96490b38 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 8a93ac67b21f..846028678089 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