Prefer MK_SSP=no to SSP_CFLAGS=

It is more idiomatic. CFLAGS is only augmented with $SSP_CFLAGS when
$MK_SSP != "no".

Reviewed by:	imp
MFC after:	1 week
Differential Revision:	https://reviews.freebsd.org/D31401

(cherry picked from commit 61ed578ee6)
This commit is contained in:
Mitchell Horne committed 2021-08-11 14:20:01 -03:00
1 parent db26d3ca59
commit 62bee146aa
6 files changed
+9 -11

No files matched your search

+4 -4
View File
@@ -655,7 +655,6 @@ BSARGS= DESTDIR= \
MAKEOBJDIRPREFIX= \
BOOTSTRAPPING=${OSRELDATE} \
BWPHASE=${.TARGET:C,^_,,} \
SSP_CFLAGS= \
-DNO_CPU_CFLAGS \
-DNO_LINT \
-DNO_PIC \
@@ -669,6 +668,7 @@ BSARGS= DESTDIR= \
MK_MAN=no \
MK_PROFILE=no \
MK_RETPOLINE=no \
MK_SSP=no \
MK_TESTS=no \
MK_WARNS=no \
MK_INCLUDES=yes
@@ -687,7 +687,6 @@ TMAKE= \
DESTDIR= \
BOOTSTRAPPING=${OSRELDATE} \
BWPHASE=${.TARGET:C,^_,,} \
SSP_CFLAGS= \
-DNO_CPU_CFLAGS \
-DNO_LINT \
MK_CTF=no \
@@ -696,6 +695,7 @@ TMAKE= \
MK_CLANG_FULL=no \
MK_LLDB=no \
MK_RETPOLINE=no \
MK_SSP=no \
MK_TESTS=no \
MK_WARNS=no
@@ -718,7 +718,6 @@ KTMAKE= \
OBJROOT='$${OBJTOP}/' \
MAKEOBJDIRPREFIX= \
BOOTSTRAPPING=${OSRELDATE} \
SSP_CFLAGS= \
-DNO_CPU_CFLAGS \
-DNO_LINT \
-DNO_PIC \
@@ -727,6 +726,7 @@ KTMAKE= \
MK_HTML=no \
MK_MAN=no \
MK_PROFILE=no \
MK_SSP=no \
MK_RETPOLINE=no \
MK_WARNS=no
@@ -2499,7 +2499,6 @@ NXBMAKEARGS+= \
-DNO_SHARED \
-DNO_CPU_CFLAGS \
-DNO_PIC \
SSP_CFLAGS= \
MK_CLANG_EXTRAS=no \
MK_CLANG_FORMAT=no \
MK_CLANG_FULL=no \
@@ -2516,6 +2515,7 @@ NXBMAKEARGS+= \
MK_RETPOLINE=no \
MK_SENDMAIL=no \
MK_SVNLITE=no \
MK_SSP=no \
MK_TESTS=no \
MK_WARNS=no \
MK_ZFS=no
+2 -1
View File
@@ -197,7 +197,7 @@ build${libcompat}: .PHONY
${_+_}cd ${.CURDIR}/${_dir}; \
WORLDTMP=${WORLDTMP} \
MAKEFLAGS="-m ${.CURDIR}/tools/build/mk ${.MAKEFLAGS}" \
${MAKE} SSP_CFLAGS= DESTDIR= \
${MAKE} DESTDIR= \
OBJTOP=${LIBCOMPAT_OBJTOP} \
OBJROOT='$${OBJTOP}/' \
MAKEOBJDIRPREFIX= \
@@ -206,6 +206,7 @@ build${libcompat}: .PHONY
-DNO_CPU_CFLAGS \
MK_CTF=no \
MK_RETPOLINE=no \
MK_SSP=no \
MK_WARNS=no \
${_t}
.endfor
+1 -2
View File
@@ -1,12 +1,11 @@
# $FreeBSD$
SSP_CFLAGS=
SED_FIX_NOTE = -i "" -e '/\.note\.tag/s/progbits/note/'
NO_WMISSING_VARIABLE_DECLARATIONS=
.include <src.opts.mk>
MK_SSP= no
.if ${MK_BSD_CRTBEGIN} != "no" && !defined(BUILDING_TESTS)
+1 -1
View File
@@ -20,10 +20,10 @@ SHLIBDIR= ${LIBDIR}
NO_PIC=
MK_PROFILE= no
MK_SSP= no
WARNS?= 0
SSP_CFLAGS=
CFLAGS+= -DNDEBUG
CFLAGS+= -DHAVE_RPC_XDR_H=0
CFLAGS+= -DSANITIZER_SUPPORTS_WEAK_HOOKS=0
-2
View File
@@ -120,8 +120,6 @@ LD_FLAGS+= -m elf_i386_fbsd
AFLAGS+= --32
.endif
SSP_CFLAGS=
# Add in the no float / no SIMD stuff and announce we're freestanding
# aarch64 and riscv don't have -msoft-float, but all others do. riscv
# currently has no /boot/loader, but may soon.
+1 -1
View File
@@ -39,7 +39,6 @@ BSARGS= DESTDIR= \
MAKEOBJDIRPREFIX= \
BOOTSTRAPPING=${OSRELDATE} \
BWPHASE=${.TARGET} \
SSP_CFLAGS= \
-DNO_CPU_CFLAGS \
-DNO_LINT \
-DNO_PIC \
@@ -52,6 +51,7 @@ BSARGS= DESTDIR= \
MK_LLDB=no \
MK_MAN=no \
MK_PROFILE=no \
MK_SSP=no \
MK_TESTS=no \
MK_WARNS=no \
MK_INCLUDES=yes