diff options
| author | Mitchell Horne <mhorne@FreeBSD.org> | 2021-08-04 18:20:50 +0000 |
|---|---|---|
| committer | Mitchell Horne <mhorne@FreeBSD.org> | 2021-08-04 18:23:22 +0000 |
| commit | 61ed578ee66648eff206ee5622b66727bfb52e78 (patch) | |
| tree | e23af5f15b9616ef727d9446e2a9f09e8fbe5c5d /Makefile.inc1 | |
| parent | 1b8db4b4e3614ef6334ce776dcdd46fe7f2c5a78 (diff) | |
| download | src-61ed578ee66648eff206ee5622b66727bfb52e78.tar.gz src-61ed578ee66648eff206ee5622b66727bfb52e78.zip | |
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
Diffstat (limited to 'Makefile.inc1')
| -rw-r--r-- | Makefile.inc1 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index b61ed693af77..be8ac02353e1 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -714,7 +714,6 @@ BSARGS= DESTDIR= \ MAKEOBJDIRPREFIX= \ BOOTSTRAPPING=${BOOTSTRAPPING_OSRELDATE} \ BWPHASE=${.TARGET:C,^_,,} \ - SSP_CFLAGS= \ -DNO_CPU_CFLAGS \ -DNO_LINT \ -DNO_PIC \ @@ -729,6 +728,7 @@ BSARGS= DESTDIR= \ MK_MAN=no \ MK_PROFILE=no \ MK_RETPOLINE=no \ + MK_SSP=no \ MK_TESTS=no \ MK_UBSAN=no \ MK_WERROR=no \ @@ -749,7 +749,6 @@ TMAKE= \ DESTDIR= \ BOOTSTRAPPING=${BOOTSTRAPPING_OSRELDATE} \ BWPHASE=${.TARGET:C,^_,,} \ - SSP_CFLAGS= \ -DNO_CPU_CFLAGS \ -DNO_LINT \ MK_ASAN=no \ @@ -759,6 +758,7 @@ TMAKE= \ MK_CLANG_FULL=no \ MK_LLDB=no \ MK_RETPOLINE=no \ + MK_SSP=no \ MK_TESTS=no \ MK_UBSAN=no \ MK_WERROR=no @@ -784,7 +784,6 @@ KTMAKE= ${TIME_ENV} \ OBJROOT='$${OBJTOP}/' \ MAKEOBJDIRPREFIX= \ BOOTSTRAPPING=${BOOTSTRAPPING_OSRELDATE} \ - SSP_CFLAGS= \ -DNO_CPU_CFLAGS \ -DNO_LINT \ -DNO_PIC \ @@ -793,6 +792,7 @@ KTMAKE= ${TIME_ENV} \ MK_HTML=no \ MK_MAN=no \ MK_PROFILE=no \ + MK_SSP=no \ MK_RETPOLINE=no \ MK_WERROR=no @@ -2768,7 +2768,6 @@ NXBMAKEARGS+= \ -DNO_SHARED \ -DNO_CPU_CFLAGS \ -DNO_PIC \ - SSP_CFLAGS= \ MK_CASPER=no \ MK_CLANG_EXTRAS=no \ MK_CLANG_FORMAT=no \ @@ -2784,6 +2783,7 @@ NXBMAKEARGS+= \ MK_PROFILE=no \ MK_RETPOLINE=no \ MK_SENDMAIL=no \ + MK_SSP=no \ MK_TESTS=no \ MK_WERROR=no \ MK_ZFS=no |