CVS commit: pkgsrc/lang/openjdk7

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Tue Oct  1 14:54:31 UTC 2019

Modified Files:
        pkgsrc/lang/openjdk7: Makefile

Log Message:
openjdk7: invert GCC>=6 conditional to make it more future proof


To generate a diff of this commit:
cvs rdiff -u -r1.137 -r1.138 pkgsrc/lang/openjdk7/Makefile

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

Modified files:

Index: pkgsrc/lang/openjdk7/Makefile
diff -u pkgsrc/lang/openjdk7/Makefile:1.137 pkgsrc/lang/openjdk7/Makefile:1.138
--- pkgsrc/lang/openjdk7/Makefile:1.137 Sun Sep 22 14:47:00 2019
+++ pkgsrc/lang/openjdk7/Makefile       Tue Oct  1 14:54:31 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.137 2019/09/22 14:47:00 tnn Exp $
+# $NetBSD: Makefile,v 1.138 2019/10/01 14:54:31 tnn Exp $
 
 JDK_MICRO=     141
 DISTNAME=      openjdk-1.7.${JDK_MICRO}-20170813
@@ -137,7 +137,7 @@ SUBST_SED.mapfix2=  -e '/environ/d'
 CFLAGS+=       -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS
 CXXFLAGS+=     -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS
 
-.if !empty(CC_VERSION:Mgcc-[67].*)
+.if !empty(PKGSRC_COMPILER:Mgcc) && empty(CC_VERSION:Mgcc-[2345].*)
 CFLAGS+=       -fno-lifetime-dse
 CFLAGS+=       -fno-delete-null-pointer-checks
 .endif