Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/share/mk Add NO{SSP,FORTIFY}



details:   https://anonhg.NetBSD.org/src/rev/185c75f1fb32
branches:  trunk
changeset: 344118:185c75f1fb32
user:      christos <christos%NetBSD.org@localhost>
date:      Sun Mar 13 17:56:56 2016 +0000

description:
Add NO{SSP,FORTIFY}

diffstat:

 share/mk/bsd.README |  8 +++++++-
 share/mk/bsd.own.mk |  4 ++--
 share/mk/bsd.sys.mk |  4 ++--
 share/mk/bsd.x11.mk |  4 ++--
 4 files changed, 13 insertions(+), 7 deletions(-)

diffs (83 lines):

diff -r de88503257c2 -r 185c75f1fb32 share/mk/bsd.README
--- a/share/mk/bsd.README       Sun Mar 13 17:48:53 2016 +0000
+++ b/share/mk/bsd.README       Sun Mar 13 17:56:56 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.README,v 1.352 2016/02/21 03:34:27 christos Exp $
+#      $NetBSD: bsd.README,v 1.353 2016/03/13 17:56:56 christos Exp $
 #      @(#)bsd.README  8.2 (Berkeley) 4/2/94
 
 This is the README file for the make "include" files for the NetBSD
@@ -487,6 +487,9 @@
                of about 5%.
                Default: "no", unless "USE_FORT" is set to "yes"
 
+NOSSP          Don't compile with stack protector during build.
+               It is set internally for standalone programs.
+
 USE_FORT       If "yes" turns on substitute wrappers for commonly used
                functions that do not do bounds checking regularly, but
                they could in some cases by using the gcc
@@ -495,6 +498,9 @@
                These substitute functions are in /usr/include/ssp.
                Default: depends on the part of the source tree
 
+NOFORT         Don't compile with substitute wrappers during build.
+               It is set internally for standalone programs.
+
 USE_YP         If "no", disables building YP (NIS) support into
                various system utilities/libraries that support it.
                If ${MKYP} is "no", USE_YP will also be forced to "no".
diff -r de88503257c2 -r 185c75f1fb32 share/mk/bsd.own.mk
--- a/share/mk/bsd.own.mk       Sun Mar 13 17:48:53 2016 +0000
+++ b/share/mk/bsd.own.mk       Sun Mar 13 17:56:56 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.own.mk,v 1.906 2016/03/13 01:06:51 mrg Exp $
+#      $NetBSD: bsd.own.mk,v 1.907 2016/03/13 17:56:56 christos Exp $
 
 # This needs to be before bsd.init.mk
 .if defined(BSD_MK_COMPAT_FILE)
@@ -122,7 +122,7 @@
 HAVE_SSP?=     no
 .else
 HAVE_SSP?=     yes
-.if ${USE_FORT:Uno} != "no"
+.if !defined(NOFORT) && ${USE_FORT:Uno} != "no"
 USE_SSP?=      yes
 .endif
 .endif
diff -r de88503257c2 -r 185c75f1fb32 share/mk/bsd.sys.mk
--- a/share/mk/bsd.sys.mk       Sun Mar 13 17:48:53 2016 +0000
+++ b/share/mk/bsd.sys.mk       Sun Mar 13 17:56:56 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.sys.mk,v 1.254 2016/03/12 23:08:58 mrg Exp $
+#      $NetBSD: bsd.sys.mk,v 1.255 2016/03/13 17:56:56 christos Exp $
 #
 # Build definitions used for NetBSD source tree builds.
 
@@ -114,7 +114,7 @@
 CFLAGS+=       ${${_NOWERROR} == "no" :?-Werror:} ${CWARNFLAGS}
 LINTFLAGS+=    ${DESTDIR:D-d ${DESTDIR}/usr/include}
 
-.if (${USE_SSP:Uno} != "no") && (${BINDIR:Ux} != "/usr/mdec")
+.if !defined(NOSSP) && (${USE_SSP:Uno} != "no") && (${BINDIR:Ux} != "/usr/mdec")
 .if !defined(KERNSRCDIR) && !defined(KERN) # not for kernels nor kern modules
 CPPFLAGS+=     -D_FORTIFY_SOURCE=2
 .endif
diff -r de88503257c2 -r 185c75f1fb32 share/mk/bsd.x11.mk
--- a/share/mk/bsd.x11.mk       Sun Mar 13 17:48:53 2016 +0000
+++ b/share/mk/bsd.x11.mk       Sun Mar 13 17:56:56 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.x11.mk,v 1.117 2015/07/23 08:03:26 mrg Exp $
+#      $NetBSD: bsd.x11.mk,v 1.118 2016/03/13 17:56:56 christos Exp $
 
 .include <bsd.init.mk>
 
@@ -10,7 +10,7 @@
 
 .include <bsd.sys.mk>
 
-.if defined(USE_SSP) && (${USE_SSP} != "no")
+.if !defined(NOSSP) && (${USE_SSP:Uno} != "no")
 CPPFLAGS+=             -DNO_ALLOCA
 .endif
 



Home | Main Index | Thread Index | Old Index