From c6b00391b3af4dea7986bb06ab08d21e1abc3b51 Mon Sep 17 00:00:00 2001 From: John Baldwin Date: Sat, 28 Sep 2019 14:20:28 +0000 Subject: [PATCH] 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 --- Makefile.inc1 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Makefile.inc1 b/Makefile.inc1 index 3ca58b38e5ff..c4826cfb35cf 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -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}