summaryrefslogtreecommitdiff
path: root/external/bsd/ipf
diff options
context:
space:
mode:
authormrg <mrg@NetBSD.org>2019-09-29 23:44:58 +0000
committermrg <mrg@NetBSD.org>2019-09-29 23:44:58 +0000
commit1569c011b51d28c2f219bbdf7281fefeeea0891c (patch)
tree2125d7503b81db3a434346b57a987a80efbb25a2 /external/bsd/ipf
parentae69ca9eb73a1079739da2f83bad6e93d123c746 (diff)
convert HAVE_GCC == 7 to HAVE_GCC >= 7.
Diffstat (limited to 'external/bsd/ipf')
-rw-r--r--external/bsd/ipf/bin/ipf/Makefile4
-rw-r--r--external/bsd/ipf/bin/ipftest/Makefile4
2 files changed, 4 insertions, 4 deletions
diff --git a/external/bsd/ipf/bin/ipf/Makefile b/external/bsd/ipf/bin/ipf/Makefile
index f842da29eb4..c42cbdd18dd 100644
--- a/external/bsd/ipf/bin/ipf/Makefile
+++ b/external/bsd/ipf/bin/ipf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2019/02/05 08:08:59 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2019/09/29 23:44:58 mrg Exp $
.include <bsd.own.mk> # for MKDYNAMICROOT definition
@@ -42,7 +42,7 @@ LDSTATIC?= -static
.endif
# Ugh. Generates too large offsets with -O2.
-.if defined(HAVE_GCC) && ${HAVE_GCC} == 7 && ${ACTIVE_CC} == "gcc"
+.if defined(HAVE_GCC) && ${HAVE_GCC} >= 7 && ${ACTIVE_CC} == "gcc"
. if ${MACHINE_CPU} == "m68k" && empty(CFLAGS:M-O0)
COPTS.ipf_y.c+= -O1
. endif
diff --git a/external/bsd/ipf/bin/ipftest/Makefile b/external/bsd/ipf/bin/ipftest/Makefile
index d4b65e4539d..1427b3fdb71 100644
--- a/external/bsd/ipf/bin/ipftest/Makefile
+++ b/external/bsd/ipf/bin/ipftest/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2019/02/05 08:08:59 mrg Exp $
+# $NetBSD: Makefile,v 1.6 2019/09/29 23:44:58 mrg Exp $
.include <bsd.own.mk>
@@ -103,7 +103,7 @@ ipf_l.h: lexer.h
${.ALLSRC} > ${.TARGET}
# Ugh. Generates too large offsets with -O2.
-.if defined(HAVE_GCC) && ${HAVE_GCC} == 7 && ${ACTIVE_CC} == "gcc"
+.if defined(HAVE_GCC) && ${HAVE_GCC} >= 7 && ${ACTIVE_CC} == "gcc"
. if ${MACHINE_CPU} == "m68k" && empty(CFLAGS:M-O0)
COPTS.ipf_y.c+= -O1
. endif