svn commit: r352845 - head
John Baldwin
jhb at FreeBSD.org
Sat Sep 28 14:20:29 UTC 2019
Author: jhb
Date: Sat Sep 28 14:20:28 2019
New Revision: 352845
URL: https://svnweb.freebsd.org/changeset/base/352845
Log:
Disable build of LOCAL_MODULES for cross-builds by default.
WITHOUT_LOCAL_MODULES can be set to disable LOCAL_MODULES for native
builds. WITH_LOCAL_MODULES can be set to leave it enabled for cross
builds.
This does not use a knob in kern.opts.mk because the options framework
does not currently support options whose default varies on the build
type. I discussed a few options there with Warner (e.g. maybe having
a tri-state where the default value is "auto" and having Makefile.inc1
apply logic when MK_LOCAL_MODULES is set to "auto"), but Warner ok'd
this approach for now until a better solution is implemented.
Requested by: many
Reviewed by: imp (in person at EuroBSDCon)
Differential Revision: https://reviews.freebsd.org/D21608
Modified:
head/Makefile.inc1
Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1 Sat Sep 28 14:14:42 2019 (r352844)
+++ head/Makefile.inc1 Sat Sep 28 14:20:28 2019 (r352845)
@@ -678,6 +678,10 @@ CROSSENV+= BUILD_TOOLS_META=.NOMETA
.if defined(TARGET_CFLAGS)
CROSSENV+= ${TARGET_CFLAGS}
.endif
+.if (${TARGET} != ${MACHINE} && !defined(WITH_LOCAL_MODULES)) || \
+ defined(WITHOUT_LOCAL_MODULES)
+CROSSENV+= LOCAL_MODULES=
+.endif
BOOTSTRAPPING_OSRELDATE?=${OSRELDATE}
More information about the svn-src-all
mailing list