[pkgsrc/trunk]: pkgsrc/lang/openjdk7 openjdk7: invert GCC>=6 conditional to m...

[tnn <tnn%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/cfc8a7150919
branches:  trunk
changeset: 340322:cfc8a7150919
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Tue Oct 01 14:54:31 2019 +0000

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

diffstat:

 lang/openjdk7/Makefile |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (18 lines):

diff -r a26e8b5bc91a -r cfc8a7150919 lang/openjdk7/Makefile
--- a/lang/openjdk7/Makefile    Tue Oct 01 14:45:46 2019 +0000
+++ b/lang/openjdk7/Makefile    Tue Oct 01 14:54:31 2019 +0000
@@ -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 @@
 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