svn commit: r341433 - head/stand
Warner Losh
imp at FreeBSD.org
Mon Dec 3 17:51:11 UTC 2018
Author: imp
Date: Mon Dec 3 17:51:10 2018
New Revision: 341433
URL: https://svnweb.freebsd.org/changeset/base/341433
Log:
Move inclusion of src.opts.mk later.
src.opts.mk includes bsd.own.mk. This in turn defines CTFCONVERT_CMD
depending on the MK_CTF value. We then set MK_CTF to no, which has no
real effect. The solution is to set all the MK_foo values before
including src.opts.mk.
This should stop the cdboot binary from exploding in size for releases
built WITH_CTF=yes in src.conf.
Sponsored by: Netflix
Modified:
head/stand/defs.mk
Modified: head/stand/defs.mk
==============================================================================
--- head/stand/defs.mk Mon Dec 3 17:46:53 2018 (r341432)
+++ head/stand/defs.mk Mon Dec 3 17:51:10 2018 (r341433)
@@ -1,12 +1,12 @@
# $FreeBSD$
-.include <src.opts.mk>
-
-WARNS?=1
-
.if !defined(__BOOT_DEFS_MK__)
__BOOT_DEFS_MK__=${MFILE}
+# We need to define all the MK_ options before including src.opts.mk
+# because it includes bsd.own.mk which needs the right MK_ values,
+# espeically MK_CTF.
+
MK_CTF= no
MK_SSP= no
MK_PROFILE= no
@@ -15,6 +15,10 @@ MAN=
NO_PIC=
INTERNALLIB=
.endif
+
+.include <src.opts.mk>
+
+WARNS?= 1
BOOTSRC= ${SRCTOP}/stand
EFISRC= ${BOOTSRC}/efi
More information about the svn-src-all
mailing list