diff options
| author | Warner Losh <imp@FreeBSD.org> | 2018-12-03 17:51:10 +0000 |
|---|---|---|
| committer | Warner Losh <imp@FreeBSD.org> | 2018-12-03 17:51:10 +0000 |
| commit | 991699dbba31cda221ed1bdf4927dcea8e5c4c0a (patch) | |
| tree | 02744525a0361e57256a7abb139e8e384c3e296a | |
| parent | 668e070f0b7653f935324292247d7042069b9ee7 (diff) | |
| download | src-991699dbba31cda221ed1bdf4927dcea8e5c4c0a.tar.gz src-991699dbba31cda221ed1bdf4927dcea8e5c4c0a.zip | |
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
Notes
Notes:
svn path=/head/; revision=341433
| -rw-r--r-- | stand/defs.mk | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/stand/defs.mk b/stand/defs.mk index 7ff84d85c7c7..0d66fba0cf69 100644 --- a/stand/defs.mk +++ b/stand/defs.mk @@ -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 |