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
This commit is contained in:
Warner Losh 2018-12-03 17:51:10 +00:00
parent 668e070f0b
commit 991699dbba

View File

@ -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
@ -16,6 +16,10 @@ NO_PIC=
INTERNALLIB=
.endif
.include <src.opts.mk>
WARNS?= 1
BOOTSRC= ${SRCTOP}/stand
EFISRC= ${BOOTSRC}/efi
EFIINC= ${EFISRC}/include