Skip to content

Commit

Permalink
Move inclusion of src.opts.mk later.
Browse files Browse the repository at this point in the history
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
  • Loading branch information
bsdimp committed Dec 3, 2018
1 parent 668e070 commit 991699d
Showing 1 changed file with 8 additions and 4 deletions.
12 changes: 8 additions & 4 deletions stand/defs.mk
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -16,6 +16,10 @@ NO_PIC=
INTERNALLIB=
.endif

.include <src.opts.mk>

WARNS?= 1

BOOTSRC= ${SRCTOP}/stand
EFISRC= ${BOOTSRC}/efi
EFIINC= ${EFISRC}/include
Expand Down

0 comments on commit 991699d

Please sign in to comment.