Author: kevans
Date: Thu Oct 24 02:25:30 2019
New Revision: 353969
URL: https://svnweb.freebsd.org/changeset/base/353969
Log:
MFC r341433: 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.
Modified:
stable/12/stand/defs.mk
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/stand/defs.mk
==============================================================================
--- stable/12/stand/defs.mk Thu Oct 24 02:22:52 2019 (r353968)
+++ stable/12/stand/defs.mk Thu Oct 24 02:25:30 2019 (r353969)
@@ -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
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
