CVS commit: pkgsrc/mk/platform

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Fri Aug  4 08:59:20 UTC 2017

Modified Files:
        pkgsrc/mk/platform: Linux.mk

Log Message:
Disable fortify on Linux when optimisation is not enabled, it is not
supported in that configuration and warnings are issued from the system
headers.


To generate a diff of this commit:
cvs rdiff -u -r1.75 -r1.76 pkgsrc/mk/platform/Linux.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mk/platform/Linux.mk
diff -u pkgsrc/mk/platform/Linux.mk:1.75 pkgsrc/mk/platform/Linux.mk:1.76
--- pkgsrc/mk/platform/Linux.mk:1.75    Fri Jun  9 17:21:53 2017
+++ pkgsrc/mk/platform/Linux.mk Fri Aug  4 08:59:20 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Linux.mk,v 1.75 2017/06/09 17:21:53 khorben Exp $
+# $NetBSD: Linux.mk,v 1.76 2017/08/04 08:59:20 jperkin Exp $
 #
 # Variable definitions for the Linux operating system.
 
@@ -119,8 +119,11 @@ _OPSYS_CAN_CHECK_SHLIBS=   yes # use reade
 _OPSYS_MAX_CMDLEN_CMD?=        /usr/bin/getconf ARG_MAX
 .endif
 
-# Register support for FORTIFY (with GCC)
+# Register support for FORTIFY (with GCC).  Linux only supports FORTIFY
+# when optimisation is enabled, otherwise warnings are issued.
+.if !empty(CFLAGS:M-O*)
 _OPSYS_SUPPORTS_FORTIFY=yes
+.endif
 
 # Register support for RELRO on supported architectures (with GCC)
 .if (${MACHINE_ARCH} == "i386") || \