From owner-svn-src-head@freebsd.org Sat Sep 28 14:20:29 2019 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 4ABC3128811; Sat, 28 Sep 2019 14:20:29 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46gW651HB5z4Gw8; Sat, 28 Sep 2019 14:20:29 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0FF9728EC; Sat, 28 Sep 2019 14:20:29 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x8SEKSDt028156; Sat, 28 Sep 2019 14:20:28 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x8SEKSp3028155; Sat, 28 Sep 2019 14:20:28 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <201909281420.x8SEKSp3028155@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin Date: Sat, 28 Sep 2019 14:20:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r352845 - head X-SVN-Group: head X-SVN-Commit-Author: jhb X-SVN-Commit-Paths: head X-SVN-Commit-Revision: 352845 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 28 Sep 2019 14:20:29 -0000 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}