CVS commit: pkgsrc/mk/compiler

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Fri Nov 10 11:52:27 UTC 2023

Modified Files:
        pkgsrc/mk/compiler: gcc.mk

Log Message:
Also filter the inverse of -Wno-c++-compat when unsupported.


To generate a diff of this commit:
cvs rdiff -u -r1.266 -r1.267 pkgsrc/mk/compiler/gcc.mk

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

Modified files:

Index: pkgsrc/mk/compiler/gcc.mk
diff -u pkgsrc/mk/compiler/gcc.mk:1.266 pkgsrc/mk/compiler/gcc.mk:1.267
--- pkgsrc/mk/compiler/gcc.mk:1.266     Thu Nov  9 08:47:42 2023
+++ pkgsrc/mk/compiler/gcc.mk   Fri Nov 10 11:52:27 2023
@@ -1,4 +1,4 @@
-# $NetBSD: gcc.mk,v 1.266 2023/11/09 08:47:42 nia Exp $
+# $NetBSD: gcc.mk,v 1.267 2023/11/10 11:52:27 nia Exp $
 #
 # This is the compiler definition for the GNU Compiler Collection.
 #
@@ -325,7 +325,7 @@ _GCC_VERSION=       0
 .endif
 _GCC_PKG=      gcc-${_GCC_VERSION:C/-.*$//}
 
-.if !empty(_GCC_VERSION:M[23]..*) || !empty(_GCC_VERSION:M4.[01].*)
+.if !empty(_GCC_VERSION:M[23].*) || !empty(_GCC_VERSION:M4.[01].*)
 # A lot of packages attempt to do this as a workaround for a
 # well-intentioned default in XCode 12+, but it's a common cause of
 # build failures on old versions of Darwin which use gcc and don't
@@ -335,17 +335,18 @@ _GCC_PKG= gcc-${_GCC_VERSION:C/-.*$//}
 BUILDLINK_TRANSFORM+=  rm:-Wno-error=implicit-function-declaration
 .endif
 
-.if !empty(_GCC_VERSION:M[23]..*) || !empty(_GCC_VERSION:M4.[012].*)
+.if !empty(_GCC_VERSION:M[23].*) || !empty(_GCC_VERSION:M4.[012].*)
 # Added in GCC 4.3
 BUILDLINK_TRANSFORM+=  rm:-Wvla
 .endif
 
-.if !empty(_GCC_VERSION:M[23]..*) || !empty(_GCC_VERSION:M4.0.*)
+.if !empty(_GCC_VERSION:M[23].*) || !empty(_GCC_VERSION:M4.0.*)
 # Added in GCC 4.3
 BUILDLINK_TRANSFORM+=  rm:-Wc++-compat
+BUILDLINK_TRANSFORM+=  rm:-Wno-c++-compat
 .endif
 
-.if !empty(_GCC_VERSION:M[23]..*) || !empty(_GCC_VERSION:M4.[0-8].*)
+.if !empty(_GCC_VERSION:M[23].*) || !empty(_GCC_VERSION:M4.[0-8].*)
 COMPILER_HAS_C11?=     no
 .else
 COMPILER_HAS_C11?=     yes