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:
parent
668e070f0b
commit
991699dbba
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=341433
@ -1,12 +1,12 @@
|
|||||||
# $FreeBSD$
|
# $FreeBSD$
|
||||||
|
|
||||||
.include <src.opts.mk>
|
|
||||||
|
|
||||||
WARNS?=1
|
|
||||||
|
|
||||||
.if !defined(__BOOT_DEFS_MK__)
|
.if !defined(__BOOT_DEFS_MK__)
|
||||||
__BOOT_DEFS_MK__=${MFILE}
|
__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_CTF= no
|
||||||
MK_SSP= no
|
MK_SSP= no
|
||||||
MK_PROFILE= no
|
MK_PROFILE= no
|
||||||
@ -16,6 +16,10 @@ NO_PIC=
|
|||||||
INTERNALLIB=
|
INTERNALLIB=
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
|
.include <src.opts.mk>
|
||||||
|
|
||||||
|
WARNS?= 1
|
||||||
|
|
||||||
BOOTSRC= ${SRCTOP}/stand
|
BOOTSRC= ${SRCTOP}/stand
|
||||||
EFISRC= ${BOOTSRC}/efi
|
EFISRC= ${BOOTSRC}/efi
|
||||||
EFIINC= ${EFISRC}/include
|
EFIINC= ${EFISRC}/include
|
||||||
|
Loading…
Reference in New Issue
Block a user