Date: Thu, 2 Sep 2021 23:58:52 GMT From: Dimitry Andric <dim@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 2ebf10e7a1ce - stable/12 - Revert part of r360964 Message-ID: <202109022358.182NwqnR010862@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/12 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=2ebf10e7a1ced5d3dc4059d0595743277464d915 commit 2ebf10e7a1ced5d3dc4059d0595743277464d915 Author: Eric van Gyzen <vangyzen@FreeBSD.org> AuthorDate: 2020-05-28 21:56:31 +0000 Commit: Dimitry Andric <dim@FreeBSD.org> CommitDate: 2021-09-02 23:30:13 +0000 Revert part of r360964 ports/devel/linux_libusb builds FreeBSD libusb with GCC 4.8.5 from devel/linux-c7-devtools. Restore the tests for older GCC in bsd.sys.mk to accomodate such ports. Reported by: tijl Sponsored by: Dell EMC Isilon (cherry picked from commit 824214da6434b1f0a361f6e8b94e7668db306beb) --- share/mk/bsd.sys.mk | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk index 53d6b22ee921..d884fbea1739 100644 --- a/share/mk/bsd.sys.mk +++ b/share/mk/bsd.sys.mk @@ -124,7 +124,12 @@ CWARNFLAGS+= -Wno-format # GCC # We should clean up warnings produced with these flags. # They were originally added as a quick hack to enable gcc5/6. +# The base system requires at least GCC 6.4, but some ports +# use this file with older compilers. Request an exprun +# before changing these. .if ${COMPILER_TYPE} == "gcc" +# GCC 5.2.0 +.if ${COMPILER_VERSION} >= 50200 CWARNFLAGS+= -Wno-error=address \ -Wno-error=array-bounds \ -Wno-error=attributes \ @@ -136,15 +141,20 @@ CWARNFLAGS+= -Wno-error=address \ -Wno-error=extra \ -Wno-error=inline \ -Wno-error=logical-not-parentheses \ - -Wno-error=nonnull-compare \ - -Wno-error=shift-negative-value \ -Wno-error=strict-aliasing \ - -Wno-error=tautological-compare \ -Wno-error=uninitialized \ -Wno-error=unused-but-set-variable \ - -Wno-error=unused-const-variable \ -Wno-error=unused-function \ -Wno-error=unused-value +.endif + +# GCC 6.1.0 +.if ${COMPILER_VERSION} >= 60100 +CWARNFLAGS+= -Wno-error=nonnull-compare \ + -Wno-error=shift-negative-value \ + -Wno-error=tautological-compare \ + -Wno-error=unused-const-variable +.endif # GCC 6.1.0 .if ${COMPILER_VERSION} >= 60100
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202109022358.182NwqnR010862>