diff options
| author | mrg <mrg@NetBSD.org> | 2019-09-29 23:44:58 +0000 |
|---|---|---|
| committer | mrg <mrg@NetBSD.org> | 2019-09-29 23:44:58 +0000 |
| commit | 1569c011b51d28c2f219bbdf7281fefeeea0891c (patch) | |
| tree | 2125d7503b81db3a434346b57a987a80efbb25a2 /external | |
| parent | ae69ca9eb73a1079739da2f83bad6e93d123c746 (diff) | |
convert HAVE_GCC == 7 to HAVE_GCC >= 7.
Diffstat (limited to 'external')
| -rw-r--r-- | external/bsd/atf/lib/tools/Makefile | 4 | ||||
| -rw-r--r-- | external/bsd/flex/bin/Makefile | 4 | ||||
| -rw-r--r-- | external/bsd/ipf/bin/ipf/Makefile | 4 | ||||
| -rw-r--r-- | external/bsd/ipf/bin/ipftest/Makefile | 4 | ||||
| -rw-r--r-- | external/bsd/ntp/Makefile.inc | 4 | ||||
| -rw-r--r-- | external/bsd/pdisk/bin/Makefile | 4 | ||||
| -rw-r--r-- | external/bsd/pkg_install/Makefile.inc | 4 |
7 files changed, 14 insertions, 14 deletions
diff --git a/external/bsd/atf/lib/tools/Makefile b/external/bsd/atf/lib/tools/Makefile index 38e1ce936ca..54bbfce553d 100644 --- a/external/bsd/atf/lib/tools/Makefile +++ b/external/bsd/atf/lib/tools/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2019/02/04 09:40:54 mrg Exp $ +# $NetBSD: Makefile,v 1.7 2019/09/29 23:44:58 mrg Exp $ NOLINT= # defined @@ -36,7 +36,7 @@ SRCS= application.cpp \ ui.cpp \ user.cpp -.if defined(HAVE_GCC) && ${HAVE_GCC} == 7 && ${ACTIVE_CC} == "gcc" +.if defined(HAVE_GCC) && ${HAVE_GCC} >= 7 && ${ACTIVE_CC} == "gcc" COPTS.parser.cpp += -Wno-error=maybe-uninitialized .endif diff --git a/external/bsd/flex/bin/Makefile b/external/bsd/flex/bin/Makefile index 0767d82941e..cfb32978c70 100644 --- a/external/bsd/flex/bin/Makefile +++ b/external/bsd/flex/bin/Makefile @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.4 (Berkeley) 6/24/90 -# $NetBSD: Makefile,v 1.13 2019/02/05 07:47:15 mrg Exp $ +# $NetBSD: Makefile,v 1.14 2019/09/29 23:44:58 mrg Exp $ # # By default, flex will be configured to generate 8-bit scanners only if the # -8 flag is given. If you want it to always generate 8-bit scanners, add @@ -72,7 +72,7 @@ scan.c: scan.l scan.o yylex.o: parse.h # 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.scan.c+= -O1 . endif 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 diff --git a/external/bsd/ntp/Makefile.inc b/external/bsd/ntp/Makefile.inc index d0ca8e8ddb5..f1267d68b38 100644 --- a/external/bsd/ntp/Makefile.inc +++ b/external/bsd/ntp/Makefile.inc @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.18 2019/02/04 04:05:16 mrg Exp $ +# $NetBSD: Makefile.inc,v 1.19 2019/09/29 23:44:59 mrg Exp $ .if !defined(NTP_MAKEFILE_INC) NTP_MAKEFILE_INC=yes @@ -67,7 +67,7 @@ CPPFLAGS+=-DISC_PLATFORM_NEEDIN6ADDRANY .include "${.CURDIR}/../../Makefile.inc" .endif -.if defined(HAVE_GCC) && ${HAVE_GCC} == 7 && ${ACTIVE_CC} == "gcc" +.if defined(HAVE_GCC) && ${HAVE_GCC} >= 7 && ${ACTIVE_CC} == "gcc" COPTS.configfile.c+= -Wno-error=implicit-fallthrough COPTS.libopts.c+= -Wno-error=implicit-fallthrough COPTS.ntp_loopfilter.c+= -Wno-error=implicit-fallthrough diff --git a/external/bsd/pdisk/bin/Makefile b/external/bsd/pdisk/bin/Makefile index 9ba61a68082..ecfc5bf7fa0 100644 --- a/external/bsd/pdisk/bin/Makefile +++ b/external/bsd/pdisk/bin/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2019/02/04 04:05:16 mrg Exp $ +# $NetBSD: Makefile,v 1.3 2019/09/29 23:44:59 mrg Exp $ .include <bsd.own.mk> WARNS=5 @@ -20,7 +20,7 @@ CPPFLAGS+= -I${SRCDIR} CPPFLAGS+= -D__unix__ -.if defined(HAVE_GCC) && ${HAVE_GCC} == 7 && ${ACTIVE_CC} == "gcc" +.if defined(HAVE_GCC) && ${HAVE_GCC} >= 7 && ${ACTIVE_CC} == "gcc" COPTS.file_media.c+= -Wno-error=implicit-fallthrough COPTS.pathname.c+= -Wno-error=implicit-fallthrough COPTS.pdisk.c+= -Wno-error=implicit-fallthrough diff --git a/external/bsd/pkg_install/Makefile.inc b/external/bsd/pkg_install/Makefile.inc index 367b62c26b3..070baae748d 100644 --- a/external/bsd/pkg_install/Makefile.inc +++ b/external/bsd/pkg_install/Makefile.inc @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.6 2019/02/07 23:53:20 mrg Exp $ +# $NetBSD: Makefile.inc,v 1.7 2019/09/29 23:44:59 mrg Exp $ DIST= ${NETBSDSRCDIR}/external/bsd/pkg_install/dist @@ -15,7 +15,7 @@ CWARNFLAGS+= -Wno-missing-noreturn .include <bsd.own.mk> # show_version() does not return -.if defined(HAVE_GCC) && ${HAVE_GCC} == 7 && ${ACTIVE_CC} == "gcc" +.if defined(HAVE_GCC) && ${HAVE_GCC} >= 7 && ${ACTIVE_CC} == "gcc" COPTS.main.c+= -Wno-error=implicit-fallthrough COPTS.pkg_delete.c+= -Wno-error=implicit-fallthrough .endif |
