diff --git a/1984/anonymous/Makefile b/1984/anonymous/Makefile index ad823b4c4..211c623d9 100644 --- a/1984/anonymous/Makefile +++ b/1984/anonymous/Makefile @@ -83,7 +83,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-poison-system-directories -Wno-shadow -Wno-missing-prototypes \ -Wno-strict-prototypes -Wno-missing-variable-declarations -Wno-pedantic \ @@ -95,7 +95,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1984/decot/Makefile b/1984/decot/Makefile index 5065a507d..1dcdab8c7 100644 --- a/1984/decot/Makefile +++ b/1984/decot/Makefile @@ -85,7 +85,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-format-nonliteral -Wno-missing-variable-declarations \ -Wno-pedantic -Wno-poison-system-directories -Wno-strict-prototypes \ @@ -98,7 +98,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1984/laman/Makefile b/1984/laman/Makefile index 59bcb1cc9..d531c823a 100644 --- a/1984/laman/Makefile +++ b/1984/laman/Makefile @@ -82,7 +82,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-missing-variable-declarations -Wno-pedantic \ -Wno-poison-system-directories @@ -93,7 +93,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1984/mullender/Makefile b/1984/mullender/Makefile index 40942496c..7337ef30f 100644 --- a/1984/mullender/Makefile +++ b/1984/mullender/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-missing-variable-declarations -Wno-poison-system-directories \ -Wno-pedantic -Wno-sign-conversion @@ -92,7 +92,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1985/applin/Makefile b/1985/applin/Makefile index c0cff1fa3..e0b851e0b 100644 --- a/1985/applin/Makefile +++ b/1985/applin/Makefile @@ -82,7 +82,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-pedantic -Wno-poison-system-directories # @@ -92,7 +92,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1985/august/Makefile b/1985/august/Makefile index afe309176..cafcb5530 100644 --- a/1985/august/Makefile +++ b/1985/august/Makefile @@ -82,7 +82,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-missing-prototypes -Wno-padded -Wno-pedantic \ -Wno-poison-system-directories -Wno-strict-prototypes @@ -93,7 +93,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1985/lycklama/Makefile b/1985/lycklama/Makefile index 3e5d1cc03..48b70d6b2 100644 --- a/1985/lycklama/Makefile +++ b/1985/lycklama/Makefile @@ -82,7 +82,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-implicit-int-conversion -Wno-poison-system-directories \ -Wno-unused-macros -Wno-strict-prototypes @@ -93,7 +93,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1985/shapiro/Makefile b/1985/shapiro/Makefile index db435cd10..597dd4881 100644 --- a/1985/shapiro/Makefile +++ b/1985/shapiro/Makefile @@ -82,7 +82,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-missing-variable-declarations -Wno-poison-system-directories # @@ -92,7 +92,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1985/sicherman/Makefile b/1985/sicherman/Makefile index 141ac34b0..0e8f7f89b 100644 --- a/1985/sicherman/Makefile +++ b/1985/sicherman/Makefile @@ -85,7 +85,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-poison-system-directories -Wno-comma -Wno-missing-prototypes \ -Wno-unused-macros @@ -96,7 +96,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1986/applin/Makefile b/1986/applin/Makefile index 966c16b0e..5e7dd8b27 100644 --- a/1986/applin/Makefile +++ b/1986/applin/Makefile @@ -83,7 +83,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-poison-system-directories -Wno-unknown-warning-option \ -Wno-missing-variable-declarations @@ -94,7 +94,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1986/august/Makefile b/1986/august/Makefile index 8c5c86870..32df1686a 100644 --- a/1986/august/Makefile +++ b/1986/august/Makefile @@ -82,7 +82,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-cast-align -Wno-comma -Wno-missing-prototypes \ -Wno-missing-variable-declarations -Wno-padded \ @@ -94,7 +94,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1986/bright/Makefile b/1986/bright/Makefile index 97af40668..0e61e3c56 100644 --- a/1986/bright/Makefile +++ b/1986/bright/Makefile @@ -83,7 +83,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-format-nonliteral -Wno-missing-prototypes \ -Wno-missing-variable-declarations -Wno-pedantic \ @@ -96,7 +96,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1986/hague/Makefile b/1986/hague/Makefile index 9baa9a920..bb3140ce8 100644 --- a/1986/hague/Makefile +++ b/1986/hague/Makefile @@ -83,7 +83,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-missing-prototypes -Wno-missing-variable-declarations \ -Wno-pedantic -Wno-poison-system-directories -Wno-strict-prototypes @@ -94,7 +94,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1986/holloway/Makefile b/1986/holloway/Makefile index 389a085a3..b7eb252ea 100644 --- a/1986/holloway/Makefile +++ b/1986/holloway/Makefile @@ -83,7 +83,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-missing-variable-declarations -Wno-pedantic \ -Wno-poison-system-directories -Wno-shadow -Wno-implicit-int-conversion @@ -94,7 +94,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1986/marshall/Makefile b/1986/marshall/Makefile index 48aed9e5e..352f05ad8 100644 --- a/1986/marshall/Makefile +++ b/1986/marshall/Makefile @@ -85,7 +85,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-missing-prototypes -Wno-missing-variable-declarations \ -Wno-poison-system-directories -Wno-strict-prototypes -Wno-unreachable-code @@ -96,7 +96,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1986/pawka/Makefile b/1986/pawka/Makefile index 476d2a9c8..a9b189cca 100644 --- a/1986/pawka/Makefile +++ b/1986/pawka/Makefile @@ -82,7 +82,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-missing-variable-declarations -Wno-poison-system-directories # @@ -92,7 +92,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1986/stein/Makefile b/1986/stein/Makefile index 49e3ee1b1..f61f8864a 100644 --- a/1986/stein/Makefile +++ b/1986/stein/Makefile @@ -82,7 +82,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-missing-variable-declarations -Wno-pedantic \ -Wno-poison-system-directories @@ -93,7 +93,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1986/wall/Makefile b/1986/wall/Makefile index 6dee3cbd7..1e1ee6c85 100644 --- a/1986/wall/Makefile +++ b/1986/wall/Makefile @@ -83,7 +83,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-implicit-int-conversion -Wno-missing-prototypess \ -Wno-missing-variable-declarations -Wno-poison-system-directories \ @@ -96,7 +96,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1987/biggar/Makefile b/1987/biggar/Makefile index e8b41230f..d48617f0b 100644 --- a/1987/biggar/Makefile +++ b/1987/biggar/Makefile @@ -82,7 +82,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-implicit-int-conversion -Wno-poison-system-directories # @@ -92,7 +92,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1987/heckbert/Makefile b/1987/heckbert/Makefile index e3922c5a9..9a5141d32 100644 --- a/1987/heckbert/Makefile +++ b/1987/heckbert/Makefile @@ -82,7 +82,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-missing-prototypes -Wno-missing-variable-declarations \ -Wno-pedantic -Wno-poison-system-directories -Wno-shadow -Wno-strict-prototypes @@ -93,7 +93,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1987/hines/Makefile b/1987/hines/Makefile index 35b65412f..1d22c49c8 100644 --- a/1987/hines/Makefile +++ b/1987/hines/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-poison-system-directories -Wno-shorten-64-to-32 # @@ -91,7 +91,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1987/korn/Makefile b/1987/korn/Makefile index c94f138c1..8ca611c83 100644 --- a/1987/korn/Makefile +++ b/1987/korn/Makefile @@ -82,7 +82,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-array-bounds-pointer-arithmetic -Wno-format-nonliteral \ -Wno-poison-system-directories @@ -93,7 +93,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1987/lievaart/Makefile b/1987/lievaart/Makefile index 3cab27ffb..2bcff2d71 100644 --- a/1987/lievaart/Makefile +++ b/1987/lievaart/Makefile @@ -82,7 +82,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-conditional-uninitialized -Wno-missing-prototypes \ -Wno-missing-variable-declarations -Wno-pedantic \ @@ -94,7 +94,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1987/wall/Makefile b/1987/wall/Makefile index 4ab96b5ec..0bb595fda 100644 --- a/1987/wall/Makefile +++ b/1987/wall/Makefile @@ -85,7 +85,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-format-nonliteral -Wno-implicit-int-conversion \ -Wno-missing-prototypes -Wno-missing-variable-declarations -Wno-pedantic \ @@ -97,7 +97,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # CSILENCE+= -Wno-missing-parameter-type -Wno-builtin-declaration-mismatch -Wno-unknown-warning-option # diff --git a/1987/westley/Makefile b/1987/westley/Makefile index 6f3fd8665..f2561dff0 100644 --- a/1987/westley/Makefile +++ b/1987/westley/Makefile @@ -82,7 +82,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-missing-variable-declarations \ -Wno-poison-system-directories -Wno-strict-prototypes \ @@ -94,7 +94,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1988/applin/Makefile b/1988/applin/Makefile index 7d5e70477..b9404686f 100644 --- a/1988/applin/Makefile +++ b/1988/applin/Makefile @@ -82,7 +82,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-poison-system-directories -Wno-gnu-line-marker # @@ -92,7 +92,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1988/dale/Makefile b/1988/dale/Makefile index ddf8979d2..4d497b416 100644 --- a/1988/dale/Makefile +++ b/1988/dale/Makefile @@ -83,7 +83,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-poison-system-directories -Wno-comma -Wno-missing-prototypes \ -Wno-missing-variable-declarations -Wno-pedantic -Wno-shorten-64-to-32 \ @@ -95,7 +95,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1988/isaak/Makefile b/1988/isaak/Makefile index cc5fd4ce8..b71765857 100644 --- a/1988/isaak/Makefile +++ b/1988/isaak/Makefile @@ -85,7 +85,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-pedantic # @@ -95,7 +95,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1988/litmaath/Makefile b/1988/litmaath/Makefile index e844d8595..54b223016 100644 --- a/1988/litmaath/Makefile +++ b/1988/litmaath/Makefile @@ -82,7 +82,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-poison-system-directories # @@ -92,7 +92,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1988/phillipps/Makefile b/1988/phillipps/Makefile index 5d24bef76..383b71824 100644 --- a/1988/phillipps/Makefile +++ b/1988/phillipps/Makefile @@ -84,7 +84,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-poison-system-directories -Wno-comma \ -Wno-missing-prototypes @@ -95,7 +95,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1988/reddy/Makefile b/1988/reddy/Makefile index 8b0dfb6e8..5bab905c0 100644 --- a/1988/reddy/Makefile +++ b/1988/reddy/Makefile @@ -82,7 +82,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-missing-prototypes -Wno-missing-variable-declarations \ -Wno-poison-system-directories -Wno-strict-prototypes @@ -93,7 +93,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1988/robison/Makefile b/1988/robison/Makefile index 062cb3596..2a499a585 100644 --- a/1988/robison/Makefile +++ b/1988/robison/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-implicit-int-conversion -Wno-missing-variable-declarations \ -Wno-pedantic -Wno-poison-system-directories @@ -92,7 +92,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1988/spinellis/Makefile b/1988/spinellis/Makefile index cbff078da..9adb6e147 100644 --- a/1988/spinellis/Makefile +++ b/1988/spinellis/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-empty-translation-unit -Wno-poison-system-directories # @@ -91,7 +91,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1988/westley/Makefile b/1988/westley/Makefile index f23f4db10..dfe945585 100644 --- a/1988/westley/Makefile +++ b/1988/westley/Makefile @@ -82,7 +82,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-missing-prototypes -Wno-missing-variable-declarations \ -Wno-poison-system-directories -Wno-strict-prototypes @@ -93,7 +93,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1989/fubar/Makefile b/1989/fubar/Makefile index a2998d431..e8410e838 100644 --- a/1989/fubar/Makefile +++ b/1989/fubar/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # #CSILENCE+= # @@ -91,7 +91,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1989/jar.1/Makefile b/1989/jar.1/Makefile index 5319b8bc8..0ceff63f5 100644 --- a/1989/jar.1/Makefile +++ b/1989/jar.1/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # #CSILENCE+= # @@ -91,7 +91,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1989/jar.2/Makefile b/1989/jar.2/Makefile index 9605610b6..7fd65d13d 100644 --- a/1989/jar.2/Makefile +++ b/1989/jar.2/Makefile @@ -82,7 +82,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-cast-align -Wno-comma -Wno-float-equal -Wno-implicit-int-conversion \ -Wno-missing-prototypes -Wno-missing-variable-declarations \ @@ -94,7 +94,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1989/ovdluhe/Makefile b/1989/ovdluhe/Makefile index cc32d03df..a460c029a 100644 --- a/1989/ovdluhe/Makefile +++ b/1989/ovdluhe/Makefile @@ -84,7 +84,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-implicit-int-conversion -Wno-missing-prototypes \ -Wno-missing-variable-declarations -Wno-poison-system-directories \ @@ -96,7 +96,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1989/paul/Makefile b/1989/paul/Makefile index 59e55c2e7..942d41d71 100644 --- a/1989/paul/Makefile +++ b/1989/paul/Makefile @@ -83,7 +83,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-cast-align -Wno-missing-prototypes -Wno-pedantic \ -Wno-poison-system-directories -Wno-strict-prototypes @@ -94,7 +94,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1989/robison/Makefile b/1989/robison/Makefile index b1f07f902..9c11aa2db 100644 --- a/1989/robison/Makefile +++ b/1989/robison/Makefile @@ -86,7 +86,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-missing-prototypes -Wno-poison-system-directories \ -Wno-strict-prototypes -Wno-bad-function-cast -Wno-missing-variable-declarations @@ -97,7 +97,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1989/roemer/Makefile b/1989/roemer/Makefile index 7cbcd092d..31c75a60d 100644 --- a/1989/roemer/Makefile +++ b/1989/roemer/Makefile @@ -82,7 +82,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-array-bounds-pointer-arithmetic -Wno-comma \ -Wno-implicit-int-conversion -Wno-missing-variable-declarations \ @@ -94,7 +94,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1989/tromp/Makefile b/1989/tromp/Makefile index 5394fbd4e..dc596f711 100644 --- a/1989/tromp/Makefile +++ b/1989/tromp/Makefile @@ -84,7 +84,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-format-nonliteral -Wno-missing-prototypes \ -Wno-missing-variable-declarations -Wno-pedantic \ @@ -97,7 +97,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1989/vanb/Makefile b/1989/vanb/Makefile index 39e588ec5..ee6d47098 100644 --- a/1989/vanb/Makefile +++ b/1989/vanb/Makefile @@ -82,7 +82,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-poison-system-directories # @@ -92,7 +92,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1989/westley/Makefile b/1989/westley/Makefile index c4d4d70b3..5ede3503a 100644 --- a/1989/westley/Makefile +++ b/1989/westley/Makefile @@ -85,7 +85,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-missing-prototypes -Wno-pedantic -Wno-poison-system-directories \ -Wno-strict-prototypes @@ -96,7 +96,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1990/baruch/Makefile b/1990/baruch/Makefile index e4981b24b..08a8e2993 100644 --- a/1990/baruch/Makefile +++ b/1990/baruch/Makefile @@ -82,7 +82,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-missing-variable-declarations -Wno-format-nonliteral -Wno-poison-system-directories # @@ -92,7 +92,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1990/cmills/Makefile b/1990/cmills/Makefile index 9c16a7805..16a99ec96 100644 --- a/1990/cmills/Makefile +++ b/1990/cmills/Makefile @@ -83,7 +83,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-missing-prototypes -Wno-missing-variable-declarations -Wno-pedantic \ -Wno-poison-system-directories -Wno-shadow -Wno-strict-prototypes \ @@ -96,7 +96,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1990/dds/Makefile b/1990/dds/Makefile index ee1bc4d6a..dee80550d 100644 --- a/1990/dds/Makefile +++ b/1990/dds/Makefile @@ -84,7 +84,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-missing-prototypes -Wno-missing-variable-declarations \ -Wno-poison-system-directories -Wno-shadow -Wno-shorten-64-to-32 \ @@ -96,7 +96,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1990/dg/Makefile b/1990/dg/Makefile index 75c554c3d..7c6700109 100644 --- a/1990/dg/Makefile +++ b/1990/dg/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-poison-system-directories -Wno-strict-prototypes \ -Wno-implicit-int-conversion -Wno-unused-macros @@ -92,7 +92,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1990/jaw/Makefile b/1990/jaw/Makefile index baf6b45f4..10cd69d3f 100644 --- a/1990/jaw/Makefile +++ b/1990/jaw/Makefile @@ -83,7 +83,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-implicit-int-conversion -Wno-missing-prototypes \ -Wno-missing-variable-declarations -Wno-pedantic \ @@ -96,7 +96,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1990/pjr/Makefile b/1990/pjr/Makefile index ac7205797..4669e58dd 100644 --- a/1990/pjr/Makefile +++ b/1990/pjr/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-missing-prototypes -Wno-missing-variable-declarations \ -Wno-poison-system-directories -Wno-strict-prototypes @@ -92,7 +92,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1990/scjones/Makefile b/1990/scjones/Makefile index 4622cb560..f4d0ce54a 100644 --- a/1990/scjones/Makefile +++ b/1990/scjones/Makefile @@ -82,7 +82,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-missing-variable-declarations -Wno-poison-system-directories \ -Wno-missing-prototypes @@ -93,7 +93,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1990/stig/Makefile b/1990/stig/Makefile index 4f287f383..d46a37e38 100644 --- a/1990/stig/Makefile +++ b/1990/stig/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # #CSILENCE+= # @@ -91,7 +91,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1990/tbr/Makefile b/1990/tbr/Makefile index 291389d6e..ace621d72 100644 --- a/1990/tbr/Makefile +++ b/1990/tbr/Makefile @@ -83,7 +83,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-missing-prototypes -Wno-missing-variable-declarations \ -Wno-pedantic -Wno-poison-system-directories -Wno-strict-prototypes \ @@ -95,7 +95,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1990/theorem/Makefile b/1990/theorem/Makefile index 6e381a461..cc8702be6 100644 --- a/1990/theorem/Makefile +++ b/1990/theorem/Makefile @@ -85,7 +85,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-double-promotion -Wno-float-conversion \ -Wno-missing-prototypes -Wno-missing-variable-declarations \ @@ -98,7 +98,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1990/westley/Makefile b/1990/westley/Makefile index e9eafcb4e..76d0724a7 100644 --- a/1990/westley/Makefile +++ b/1990/westley/Makefile @@ -83,7 +83,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-float-conversion -Wno-missing-variable-declarations \ -Wno-poison-system-directories -Wno-shadow -Wno-sign-conversion \ @@ -96,7 +96,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1991/ant/Makefile b/1991/ant/Makefile index 76da1a8d3..8c59df831 100644 --- a/1991/ant/Makefile +++ b/1991/ant/Makefile @@ -83,7 +83,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-implicit-int-conversion -Wno-missing-prototypes \ -Wno-missing-variable-declarations -Wno-pedantic \ @@ -96,7 +96,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1991/brnstnd/Makefile b/1991/brnstnd/Makefile index c014224b8..5614e19a7 100644 --- a/1991/brnstnd/Makefile +++ b/1991/brnstnd/Makefile @@ -82,7 +82,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-implicit-int-conversion -Wno-missing-prototypes \ -Wno-missing-variable-declarations -Wno-poison-system-directories \ @@ -95,7 +95,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1991/buzzard/Makefile b/1991/buzzard/Makefile index 45bffa1ea..7b265312f 100644 --- a/1991/buzzard/Makefile +++ b/1991/buzzard/Makefile @@ -84,7 +84,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-implicit-int-conversion -Wno-missing-prototypes \ -Wno-missing-variable-declarations -Wno-poison-system-directories \ @@ -96,7 +96,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1991/cdupont/Makefile b/1991/cdupont/Makefile index adc018c1f..cbd078a23 100644 --- a/1991/cdupont/Makefile +++ b/1991/cdupont/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-poison-system-directories # @@ -91,7 +91,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1991/davidguy/Makefile b/1991/davidguy/Makefile index 6a7bb0120..755059a3c 100644 --- a/1991/davidguy/Makefile +++ b/1991/davidguy/Makefile @@ -83,7 +83,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-bad-function-cast -Wno-conditional-uninitialized \ -Wno-implicit-int-conversion -Wno-missing-prototypes \ @@ -97,7 +97,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1991/dds/Makefile b/1991/dds/Makefile index 5cfdaaef0..cb6c9ca35 100644 --- a/1991/dds/Makefile +++ b/1991/dds/Makefile @@ -82,7 +82,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-deprecated-non-prototype -Wno-implicit-int-conversion \ -Wno-missing-variable-declarations -Wno-overlength-strings -Wno-pedantic \ @@ -94,7 +94,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1991/fine/Makefile b/1991/fine/Makefile index 824f491c1..8d2f5fe62 100644 --- a/1991/fine/Makefile +++ b/1991/fine/Makefile @@ -83,7 +83,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-poison-system-directories # @@ -93,7 +93,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # CSILENCE+= -Wno-missing-parameter-type # diff --git a/1991/rince/Makefile b/1991/rince/Makefile index 4ac9545cb..08aa27ec3 100644 --- a/1991/rince/Makefile +++ b/1991/rince/Makefile @@ -82,7 +82,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-missing-variable-declarations \ -Wno-poison-system-directories -Wno-shorten-64-to-32 @@ -93,7 +93,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1991/westley/Makefile b/1991/westley/Makefile index abcf45332..0786ea5f4 100644 --- a/1991/westley/Makefile +++ b/1991/westley/Makefile @@ -85,7 +85,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-implicit-int-conversion -Wno-missing-prototypes \ -Wno-missing-variable-declarations -Wno-pedantic \ @@ -97,7 +97,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1992/adrian/Makefile b/1992/adrian/Makefile index 3dc143774..946c26928 100644 --- a/1992/adrian/Makefile +++ b/1992/adrian/Makefile @@ -86,7 +86,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-float-conversion -Wno-missing-noreturn \ -Wno-missing-prototypes -Wno-missing-variable-declarations -Wno-padded \ @@ -100,7 +100,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1992/albert/Makefile b/1992/albert/Makefile index 838f026f0..6fb51a284 100644 --- a/1992/albert/Makefile +++ b/1992/albert/Makefile @@ -82,7 +82,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-poison-system-directories -Wno-shorten-64-to-32 # @@ -92,7 +92,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1992/ant/Makefile b/1992/ant/Makefile index af364bd51..abc6d0127 100644 --- a/1992/ant/Makefile +++ b/1992/ant/Makefile @@ -82,7 +82,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-conditional-uninitialized -Wno-implicit-int-conversion \ -Wno-missing-prototypes -Wno-missing-variable-declarations \ @@ -95,7 +95,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1992/buzzard.1/Makefile b/1992/buzzard.1/Makefile index 0baa73b0b..6f6b5beac 100644 --- a/1992/buzzard.1/Makefile +++ b/1992/buzzard.1/Makefile @@ -82,7 +82,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-missing-variable-declarations -Wno-poison-system-directories \ -Wno-unused-macros @@ -93,7 +93,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1992/buzzard.2/Makefile b/1992/buzzard.2/Makefile index befd50643..32537316f 100644 --- a/1992/buzzard.2/Makefile +++ b/1992/buzzard.2/Makefile @@ -82,7 +82,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-missing-prototypes -Wno-missing-variable-declarations \ -Wno-poison-system-directories -Wno-strict-prototypes -Wno-unreachable-code @@ -93,7 +93,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1992/gson/Makefile b/1992/gson/Makefile index d73e8c79e..9d67f355d 100644 --- a/1992/gson/Makefile +++ b/1992/gson/Makefile @@ -85,7 +85,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-implicit-int-conversion -Wno-missing-prototypes \ -Wno-missing-variable-declarations -Wno-poison-system-directories \ @@ -97,7 +97,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1992/imc/Makefile b/1992/imc/Makefile index 2a4f2972a..cdce7bbae 100644 --- a/1992/imc/Makefile +++ b/1992/imc/Makefile @@ -82,7 +82,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-error -Wno-implicit-function-declaration -Wno-format \ -Wno-missing-variable-declarations -Wno-poison-system-directorie \ @@ -95,7 +95,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1992/kivinen/Makefile b/1992/kivinen/Makefile index 252aac044..448afc6a9 100644 --- a/1992/kivinen/Makefile +++ b/1992/kivinen/Makefile @@ -82,7 +82,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-poison-system-directories -Wno-comma \ -Wno-conditional-uninitialized -Wno-sign-conversion @@ -93,7 +93,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1992/lush/Makefile b/1992/lush/Makefile index 9aecf72a2..9a99c7976 100644 --- a/1992/lush/Makefile +++ b/1992/lush/Makefile @@ -82,7 +82,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-missing-variable-declarations \ -Wno-poison-system-directories -Wno-unused-macros @@ -93,7 +93,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1992/marangon/Makefile b/1992/marangon/Makefile index 3211ec470..93907aaff 100644 --- a/1992/marangon/Makefile +++ b/1992/marangon/Makefile @@ -84,7 +84,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-missing-prototypes -Wno-missing-variable-declarations \ -Wno-poison-system-directories -Wno-strict-prototypes -Wno-unreachable-code @@ -95,7 +95,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1992/nathan/Makefile b/1992/nathan/Makefile index af58a2e29..0090a5e0c 100644 --- a/1992/nathan/Makefile +++ b/1992/nathan/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-poison-system-directories -Wno-comma -Wno-shorten-64-to-32 # @@ -91,7 +91,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1992/vern/Makefile b/1992/vern/Makefile index b0f591de0..044a7fa95 100644 --- a/1992/vern/Makefile +++ b/1992/vern/Makefile @@ -83,7 +83,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-float-conversion -Wno-missing-prototypes \ -Wno-missing-variable-declarations -Wno-poison-system-directories \ @@ -95,7 +95,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1992/westley/Makefile b/1992/westley/Makefile index 7d61dffe4..0e1502465 100644 --- a/1992/westley/Makefile +++ b/1992/westley/Makefile @@ -83,7 +83,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-poison-system-directories -Wno-int-conversion # @@ -93,7 +93,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1993/ant/Makefile b/1993/ant/Makefile index d20352b48..49ae094f4 100644 --- a/1993/ant/Makefile +++ b/1993/ant/Makefile @@ -82,7 +82,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-missing-prototypes -Wno-missing-variable-declarations \ -Wno-poison-system-directories -Wno-strict-prototypes @@ -93,7 +93,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1993/cmills/Makefile b/1993/cmills/Makefile index 0c25410b3..183450bb9 100644 --- a/1993/cmills/Makefile +++ b/1993/cmills/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-missing-prototypes -Wno-missing-variable-declarations \ -Wno-pedantic -Wno-poison-system-directories -Wno-shadow \ @@ -93,7 +93,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1993/dgibson/Makefile b/1993/dgibson/Makefile index 6e7d96e85..8549b28c9 100644 --- a/1993/dgibson/Makefile +++ b/1993/dgibson/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-missing-variable-declarations -Wno-poison-system-directories \ -Wno-unused-macros @@ -92,7 +92,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1993/ejb/Makefile b/1993/ejb/Makefile index 018ffe3c0..0ea8cb16a 100644 --- a/1993/ejb/Makefile +++ b/1993/ejb/Makefile @@ -82,7 +82,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-format-nonliteral -Wno-implicit-int-conversion \ -Wno-poison-system-directories -Wno-sign-conversion @@ -93,7 +93,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1993/jonth/Makefile b/1993/jonth/Makefile index 7fb68cca4..c18e2b0c1 100644 --- a/1993/jonth/Makefile +++ b/1993/jonth/Makefile @@ -86,7 +86,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-cast-align -Wno-comma -Wno-missing-prototypes \ -Wno-missing-variable-declarations -Wno-poison-system-directories \ @@ -99,7 +99,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1993/leo/Makefile b/1993/leo/Makefile index f2bc7617b..4e13f087f 100644 --- a/1993/leo/Makefile +++ b/1993/leo/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-implicit-int-conversion -Wno-unknown-warning-option \ -Wno-comma -Wno-conditional-uninitialized -Wno-poison-system-directories \ @@ -93,7 +93,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1993/lmfjyh/Makefile b/1993/lmfjyh/Makefile index 9cf5cf4cc..458ea4378 100644 --- a/1993/lmfjyh/Makefile +++ b/1993/lmfjyh/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-missing-variable-declarations -Wno-poison-system-directories # @@ -91,7 +91,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1993/plummer/Makefile b/1993/plummer/Makefile index 28cab46de..87a020080 100644 --- a/1993/plummer/Makefile +++ b/1993/plummer/Makefile @@ -82,7 +82,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-implicit-int-conversion -Wno-missing-variable-declarations \ -Wno-pedantic -Wno-poison-system-directories @@ -93,7 +93,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1993/rince/Makefile b/1993/rince/Makefile index 199952b45..4cf2234ec 100644 --- a/1993/rince/Makefile +++ b/1993/rince/Makefile @@ -82,7 +82,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-implicit-int-conversion -Wno-missing-prototypes \ -Wno-missing-variable-declarations -Wno-padded \ @@ -95,7 +95,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1993/schnitzi/Makefile b/1993/schnitzi/Makefile index 64d5209da..f3135bfd8 100644 --- a/1993/schnitzi/Makefile +++ b/1993/schnitzi/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-implicit-int-conversion -Wno-missing-prototypes \ -Wno-poison-system-directories -Wno-strict-prototypes @@ -92,7 +92,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1993/vanb/Makefile b/1993/vanb/Makefile index 752ffab01..b070cded0 100644 --- a/1993/vanb/Makefile +++ b/1993/vanb/Makefile @@ -82,7 +82,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-pedantic -Wno-poison-system-directories \ -Wno-missing-prototypes -Wno-missing-variable-declarations -Wno-shadow @@ -93,7 +93,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1994/dodsond1/Makefile b/1994/dodsond1/Makefile index 0779f2e98..3374b0d72 100644 --- a/1994/dodsond1/Makefile +++ b/1994/dodsond1/Makefile @@ -83,7 +83,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-conditional-uninitialized -Wno-missing-prototypes \ -Wno-missing-variable-declarations -Wno-poison-system-directories \ @@ -95,7 +95,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1994/dodsond2/Makefile b/1994/dodsond2/Makefile index eee378068..c4f8452f5 100644 --- a/1994/dodsond2/Makefile +++ b/1994/dodsond2/Makefile @@ -82,7 +82,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-implicit-int-conversion -Wno-missing-prototypes \ -Wno-missing-variable-declarations -Wno-poison-system-directories \ @@ -94,7 +94,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1994/horton/Makefile b/1994/horton/Makefile index 1de5abd6e..7b429e2f7 100644 --- a/1994/horton/Makefile +++ b/1994/horton/Makefile @@ -83,7 +83,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-float-conversion -Wno-missing-prototypes \ -Wno-missing-variable-declarations -Wno-pedantic \ @@ -96,7 +96,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1994/imc/Makefile b/1994/imc/Makefile index 08663d377..b410cabc2 100644 --- a/1994/imc/Makefile +++ b/1994/imc/Makefile @@ -82,7 +82,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-conditional-uninitialized -Wno-missing-prototypes \ -Wno-missing-variable-declarations -Wno-poison-system-directories \ @@ -94,7 +94,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1994/ldb/Makefile b/1994/ldb/Makefile index e5c68b25e..32337e9ed 100644 --- a/1994/ldb/Makefile +++ b/1994/ldb/Makefile @@ -82,7 +82,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-missing-variable-declarations -Wno-poison-system-directories \ -Wno-comma -Wno-shorten-64-to-32 @@ -93,7 +93,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1994/schnitzi/Makefile b/1994/schnitzi/Makefile index b03fb958b..9109d7254 100644 --- a/1994/schnitzi/Makefile +++ b/1994/schnitzi/Makefile @@ -82,7 +82,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-missing-variable-declarations -Wno-poison-system-directories \ -Wno-shorten-64-to-32 @@ -93,7 +93,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1994/shapiro/Makefile b/1994/shapiro/Makefile index ea8bd6634..26f04416b 100644 --- a/1994/shapiro/Makefile +++ b/1994/shapiro/Makefile @@ -82,7 +82,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-conditional-uninitialized -Wno-format-nonliteral \ -Wno-missing-variable-declarations -Wno-poison-system-directories @@ -93,7 +93,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1994/smr/Makefile b/1994/smr/Makefile index 2297eeba4..d23fd42e6 100644 --- a/1994/smr/Makefile +++ b/1994/smr/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # #CSILENCE+= # @@ -91,7 +91,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1994/tvr/Makefile b/1994/tvr/Makefile index b182bea51..dfb9a4b6e 100644 --- a/1994/tvr/Makefile +++ b/1994/tvr/Makefile @@ -83,7 +83,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-conditional-uninitialized -Wno-implicit-int-conversion \ -Wno-missing-prototypes -Wno-missing-variable-declarations \ @@ -96,7 +96,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1994/weisberg/Makefile b/1994/weisberg/Makefile index 026ddfa8e..93a8f65c6 100644 --- a/1994/weisberg/Makefile +++ b/1994/weisberg/Makefile @@ -84,7 +84,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-poison-system-directories -Wno-shift-sign-overflow \ -Wno-conditional-uninitialized -Wno-pedantic @@ -95,7 +95,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1994/westley/Makefile b/1994/westley/Makefile index f83373ea3..dcb58091b 100644 --- a/1994/westley/Makefile +++ b/1994/westley/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # #CSILENCE+= # @@ -91,7 +91,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1995/cdua/Makefile b/1995/cdua/Makefile index 703240adb..23da97437 100644 --- a/1995/cdua/Makefile +++ b/1995/cdua/Makefile @@ -82,7 +82,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-missing-variable-declarations \ -Wno-poison-system-directories -Wno-strict-prototypes \ @@ -94,7 +94,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1995/dodsond1/Makefile b/1995/dodsond1/Makefile index e5bb5a5f7..55ab4dba9 100644 --- a/1995/dodsond1/Makefile +++ b/1995/dodsond1/Makefile @@ -82,7 +82,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-implicit-int-conversion -Wno-poison-system-directories # @@ -92,7 +92,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1995/dodsond2/Makefile b/1995/dodsond2/Makefile index 1518a9458..fe4939321 100644 --- a/1995/dodsond2/Makefile +++ b/1995/dodsond2/Makefile @@ -82,7 +82,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-error -Wno-implicit-function-declaration \ -Wno-missing-variable-declarations -Wno-poison-system-directories \ @@ -94,7 +94,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1995/esde/Makefile b/1995/esde/Makefile index cbd884757..a1ad6feaa 100644 --- a/1995/esde/Makefile +++ b/1995/esde/Makefile @@ -83,7 +83,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-missing-prototypes -Wno-poison-system-directories \ -Wno-sign-conversion @@ -94,7 +94,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1995/garry/Makefile b/1995/garry/Makefile index 7595f6444..08e5ba28f 100644 --- a/1995/garry/Makefile +++ b/1995/garry/Makefile @@ -82,7 +82,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-implicit-int-conversion -Wno-missing-prototypes \ -Wno-missing-variable-declarations -Wno-poison-system-directories \ @@ -95,7 +95,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1995/heathbar/Makefile b/1995/heathbar/Makefile index 9ddea787d..7b042d8a8 100644 --- a/1995/heathbar/Makefile +++ b/1995/heathbar/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-missing-variable-declarations -Wno-poison-system-directories # @@ -91,7 +91,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1995/leo/Makefile b/1995/leo/Makefile index 0bf6fd81e..68df85776 100644 --- a/1995/leo/Makefile +++ b/1995/leo/Makefile @@ -82,7 +82,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-missing-prototypes -Wno-missing-variable-declarations \ -Wno-shadow -Wno-shorten-64-to-32 -Wno-sign-conversion -Wno-poison-system-directories @@ -93,7 +93,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1995/makarios/Makefile b/1995/makarios/Makefile index 6180d082a..2d963eaa0 100644 --- a/1995/makarios/Makefile +++ b/1995/makarios/Makefile @@ -82,7 +82,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-pedantic -Wno-poison-system-directories # @@ -92,7 +92,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1995/savastio/Makefile b/1995/savastio/Makefile index 707932cc3..ddc7fa726 100644 --- a/1995/savastio/Makefile +++ b/1995/savastio/Makefile @@ -82,7 +82,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-format-nonliteral -Wno-poison-system-directories -Wno-sign-conversion \ -Wno-strict-prototypes @@ -93,7 +93,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1995/schnitzi/Makefile b/1995/schnitzi/Makefile index 4bacc9066..2c3a55866 100644 --- a/1995/schnitzi/Makefile +++ b/1995/schnitzi/Makefile @@ -82,7 +82,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-pedantic -Wno-poison-system-directories # @@ -92,7 +92,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1995/spinellis/Makefile b/1995/spinellis/Makefile index 225ea9d0e..a7352b15a 100644 --- a/1995/spinellis/Makefile +++ b/1995/spinellis/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-missing-prototypes -Wno-missing-variable-declarations \ -Wno-poison-system-directories -Wno-shadow -Wno-shorten-64-to-32 \ @@ -93,7 +93,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1995/vanschnitz/Makefile b/1995/vanschnitz/Makefile index 8f5b5ec95..766c7f3fb 100644 --- a/1995/vanschnitz/Makefile +++ b/1995/vanschnitz/Makefile @@ -82,7 +82,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-poison-system-directories # @@ -92,7 +92,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1996/august/Makefile b/1996/august/Makefile index 6960eed81..15be88c41 100644 --- a/1996/august/Makefile +++ b/1996/august/Makefile @@ -85,7 +85,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-conditional-uninitialized -Wno-missing-variable-declarations \ -Wno-poison-system-directories @@ -96,7 +96,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1996/dalbec/Makefile b/1996/dalbec/Makefile index ae3ee2561..3b9ddce29 100644 --- a/1996/dalbec/Makefile +++ b/1996/dalbec/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-poison-system-directories -Wno-comma -Wno-missing-prototypes # @@ -91,7 +91,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1996/eldby/Makefile b/1996/eldby/Makefile index 2d9d86171..cc5c59ef6 100644 --- a/1996/eldby/Makefile +++ b/1996/eldby/Makefile @@ -82,7 +82,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-double-promotion -Wno-float-conversion -Wno-implicit-float-conversion \ -Wno-missing-prototypes -Wno-missing-variable-declarations \ @@ -94,7 +94,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1996/gandalf/Makefile b/1996/gandalf/Makefile index 6ad2e080b..bb72ceb52 100644 --- a/1996/gandalf/Makefile +++ b/1996/gandalf/Makefile @@ -83,7 +83,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-missing-prototypes -Wno-missing-variable-declarations \ -Wno-poison-system-directories -Wno-strict-prototypes -Wno-unused-macros @@ -94,7 +94,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1996/huffman/Makefile b/1996/huffman/Makefile index 4ae91bdc9..859e8ba93 100644 --- a/1996/huffman/Makefile +++ b/1996/huffman/Makefile @@ -82,7 +82,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-poison-system-directories # @@ -92,7 +92,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1996/jonth/Makefile b/1996/jonth/Makefile index 3c002c027..51bfafbd1 100644 --- a/1996/jonth/Makefile +++ b/1996/jonth/Makefile @@ -83,7 +83,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-c99-extensions -Wno-double-promotion -Wno-float-conversion \ -Wno-implicit-float-conversion -Wno-implicit-int-conversion \ @@ -97,7 +97,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1996/rcm/Makefile b/1996/rcm/Makefile index c0a66e9fc..56482cb06 100644 --- a/1996/rcm/Makefile +++ b/1996/rcm/Makefile @@ -84,7 +84,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-implicit-int-conversion -Wno-missing-prototypes \ -Wno-missing-variable-declarations -Wno-padded \ @@ -96,7 +96,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1996/schweikh1/Makefile b/1996/schweikh1/Makefile index 788a73ec7..f549a74d8 100644 --- a/1996/schweikh1/Makefile +++ b/1996/schweikh1/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-conditional-uninitialized -Wno-disabled-macro-expansion \ -Wno-missing-variable-declarations -Wno-poison-system-directories @@ -92,7 +92,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1996/schweikh2/Makefile b/1996/schweikh2/Makefile index 7f6716d6f..19e776062 100644 --- a/1996/schweikh2/Makefile +++ b/1996/schweikh2/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-poison-system-directories -Wno-sign-conversion # @@ -91,7 +91,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1996/schweikh3/Makefile b/1996/schweikh3/Makefile index bd6de970c..53dccd87c 100644 --- a/1996/schweikh3/Makefile +++ b/1996/schweikh3/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-date-time -Wno-double-promotion \ -Wno-poison-system-directories -Wno-unreachable-code @@ -92,7 +92,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1996/westley/Makefile b/1996/westley/Makefile index 2e228c899..2abd95fac 100644 --- a/1996/westley/Makefile +++ b/1996/westley/Makefile @@ -83,7 +83,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-bad-function-cast -Wno-pedantic -Wno-poison-system-directories # @@ -93,7 +93,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1998/banks/Makefile b/1998/banks/Makefile index c5cb5bfdd..a8eeb8903 100644 --- a/1998/banks/Makefile +++ b/1998/banks/Makefile @@ -85,7 +85,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-float-conversion -Wno-float-equal \ -Wno-missing-variable-declarations -Wno-poison-system-directories \ @@ -97,7 +97,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1998/bas1/Makefile b/1998/bas1/Makefile index d1765ed1e..e5c3615b4 100644 --- a/1998/bas1/Makefile +++ b/1998/bas1/Makefile @@ -83,7 +83,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-implicit-int-conversion -Wno-missing-prototypes \ -Wno-missing-variable-declarations -Wno-pedantic \ @@ -96,7 +96,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1998/bas2/Makefile b/1998/bas2/Makefile index 4f205351c..8b53d793b 100644 --- a/1998/bas2/Makefile +++ b/1998/bas2/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-missing-variable-declarations -Wno-pedantic \ -Wno-poison-system-directories @@ -92,7 +92,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1998/chaos/Makefile b/1998/chaos/Makefile index 872c87326..77eaddc4d 100644 --- a/1998/chaos/Makefile +++ b/1998/chaos/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-bad-function-cast -Wno-double-promotion -Wno-float-conversion \ -Wno-format-nonliteral -Wno-implicit-float-conversion \ @@ -94,7 +94,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1998/df/Makefile b/1998/df/Makefile index 66f486b31..f042b85ba 100644 --- a/1998/df/Makefile +++ b/1998/df/Makefile @@ -83,7 +83,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-array-bounds-pointer-arithmetic -Wno-implicit-int-conversion \ -Wno-keyword-macro -Wno-missing-prototypes \ @@ -97,7 +97,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1998/dlowe/Makefile b/1998/dlowe/Makefile index 5639b109f..1bcca1c6d 100644 --- a/1998/dlowe/Makefile +++ b/1998/dlowe/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-implicit-int-conversion -Wno-poison-system-directories # @@ -91,7 +91,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1998/dloweneil/Makefile b/1998/dloweneil/Makefile index 4ebda4744..b5bd4e260 100644 --- a/1998/dloweneil/Makefile +++ b/1998/dloweneil/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-poison-system-directories # @@ -91,7 +91,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1998/dorssel/Makefile b/1998/dorssel/Makefile index fe2dd681f..747e1e6db 100644 --- a/1998/dorssel/Makefile +++ b/1998/dorssel/Makefile @@ -82,7 +82,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-array-bounds-pointer-arithmetic -Wno-comma \ -Wno-implicit-int-conversion -Wno-poison-system-directories -Wno-shadow \ @@ -94,7 +94,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1998/fanf/Makefile b/1998/fanf/Makefile index a8c657259..58e7e3701 100644 --- a/1998/fanf/Makefile +++ b/1998/fanf/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-disabled-macro-expansion -Wno-missing-prototypes \ -Wno-missing-variable-declarations -Wno-padded \ @@ -93,7 +93,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1998/schnitzi/Makefile b/1998/schnitzi/Makefile index 5b0c6ea06..4f73a9d93 100644 --- a/1998/schnitzi/Makefile +++ b/1998/schnitzi/Makefile @@ -83,7 +83,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-implicit-int-conversion -Wno-missing-prototypes \ -Wno-missing-variable-declarations -Wno-pedantic \ @@ -96,7 +96,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1998/schweikh1/Makefile b/1998/schweikh1/Makefile index fa02942a9..b8012ee22 100644 --- a/1998/schweikh1/Makefile +++ b/1998/schweikh1/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-poison-system-directories -Wno-unused-macros # @@ -91,7 +91,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1998/schweikh2/Makefile b/1998/schweikh2/Makefile index 45efd55da..89e24b902 100644 --- a/1998/schweikh2/Makefile +++ b/1998/schweikh2/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-poison-system-directories -Wno-unused-macros -Wno-sign-conversion \ -Wno-cast-function-type @@ -92,7 +92,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1998/schweikh3/Makefile b/1998/schweikh3/Makefile index cfb328a99..7b6a791b1 100644 --- a/1998/schweikh3/Makefile +++ b/1998/schweikh3/Makefile @@ -82,7 +82,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-padded -Wno-poison-system-directories -Wno-shorten-64-to-32 \ -Wno-sign-conversion @@ -93,7 +93,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/1998/tomtorfs/Makefile b/1998/tomtorfs/Makefile index a3dacb32d..36a0027fc 100644 --- a/1998/tomtorfs/Makefile +++ b/1998/tomtorfs/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-conditional-uninitialized -Wno-poison-system-directories \ -Wno-sign-conversion -Wno-tautological-value-range-compare @@ -92,7 +92,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2000/anderson/Makefile b/2000/anderson/Makefile index 2d2b0b95a..ae4a58189 100644 --- a/2000/anderson/Makefile +++ b/2000/anderson/Makefile @@ -83,7 +83,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-implicit-int-conversion -Wno-missing-prototypes \ -Wno-missing-variable-declarations -Wno-poison-system-directories \ @@ -95,7 +95,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2000/bellard/Makefile b/2000/bellard/Makefile index 71e9f9d09..c77412306 100644 --- a/2000/bellard/Makefile +++ b/2000/bellard/Makefile @@ -82,7 +82,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-missing-prototypes -Wno-missing-variable-declarations \ -Wno-pedantic -Wno-poison-system-directories -Wno-strict-prototypes @@ -93,7 +93,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2000/bmeyer/Makefile b/2000/bmeyer/Makefile index a7a8238ee..3059b4d17 100644 --- a/2000/bmeyer/Makefile +++ b/2000/bmeyer/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-disabled-macro-expansion -Wno-float-conversion \ -Wno-format-nonliteral -Wno-missing-prototypes \ @@ -95,7 +95,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2000/briddlebane/Makefile b/2000/briddlebane/Makefile index 2f9cdbac3..14c5cc348 100644 --- a/2000/briddlebane/Makefile +++ b/2000/briddlebane/Makefile @@ -83,7 +83,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-bad-function-cast -Wno-comma -Wno-float-conversion \ -Wno-missing-prototypes -Wno-missing-variable-declarations \ @@ -96,7 +96,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2000/dhyang/Makefile b/2000/dhyang/Makefile index b2d698724..b3d5c5968 100644 --- a/2000/dhyang/Makefile +++ b/2000/dhyang/Makefile @@ -83,7 +83,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-implicit-int-conversion -Wno-missing-prototypes \ -Wno-missing-variable-declarations -Wno-poison-system-directories \ @@ -95,7 +95,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2000/dlowe/Makefile b/2000/dlowe/Makefile index 41b2f819b..1bf400ccf 100644 --- a/2000/dlowe/Makefile +++ b/2000/dlowe/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-cast-align -Wno-cast-qual -Wno-comma -Wno-float-equal \ -Wno-implicit-int-conversion -Wno-missing-prototypes -Wno-padded \ @@ -95,7 +95,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2000/jarijyrki/Makefile b/2000/jarijyrki/Makefile index 8f6395aef..842469167 100644 --- a/2000/jarijyrki/Makefile +++ b/2000/jarijyrki/Makefile @@ -86,7 +86,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-float-conversion -Wno-float-equal -Wno-implicit-int-conversion \ -Wno-missing-prototypes -Wno-missing-variable-declarations -Wno-pedantic \ @@ -99,7 +99,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2000/natori/Makefile b/2000/natori/Makefile index 5a6152857..9292defd8 100644 --- a/2000/natori/Makefile +++ b/2000/natori/Makefile @@ -82,7 +82,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-missing-variable-declarations -Wno-pedantic \ -Wno-poison-system-directories -Wno-missing-prototypes @@ -93,7 +93,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2000/primenum/Makefile b/2000/primenum/Makefile index f4a1ad18b..26a61cf54 100644 --- a/2000/primenum/Makefile +++ b/2000/primenum/Makefile @@ -82,7 +82,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-implicit-int-conversion -Wno-poison-system-directories # @@ -92,7 +92,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2000/rince/Makefile b/2000/rince/Makefile index 257e53153..867782c0e 100644 --- a/2000/rince/Makefile +++ b/2000/rince/Makefile @@ -83,7 +83,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-float-conversion -Wno-missing-prototypes \ -Wno-missing-variable-declarations -Wno-poison-system-directories \ @@ -96,7 +96,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2000/robison/Makefile b/2000/robison/Makefile index 17d460fa0..f24f1288e 100644 --- a/2000/robison/Makefile +++ b/2000/robison/Makefile @@ -83,7 +83,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-conditional-uninitialized -Wno-format-nonliteral \ -Wno-implicit-int-conversion -Wno-missing-prototypes \ @@ -96,7 +96,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2000/schneiderwent/Makefile b/2000/schneiderwent/Makefile index 20ae29cb4..9a8dda590 100644 --- a/2000/schneiderwent/Makefile +++ b/2000/schneiderwent/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-missing-variable-declarations -Wno-poison-system-directories \ -Wno-shorten-64-to-32 -Wno-sign-conversion @@ -92,7 +92,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2000/thadgavin/Makefile b/2000/thadgavin/Makefile index d9e87b317..41beb3f37 100644 --- a/2000/thadgavin/Makefile +++ b/2000/thadgavin/Makefile @@ -82,7 +82,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-float-conversion -Wno-missing-prototypes \ -Wno-missing-variable-declarations -Wno-pedantic \ @@ -94,7 +94,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2000/tomx/Makefile b/2000/tomx/Makefile index c5a8f1658..35bcd865f 100644 --- a/2000/tomx/Makefile +++ b/2000/tomx/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-poison-system-directories # @@ -91,7 +91,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2001/anonymous/Makefile b/2001/anonymous/Makefile index 0b04e9a5b..1bcf96112 100644 --- a/2001/anonymous/Makefile +++ b/2001/anonymous/Makefile @@ -87,7 +87,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-bad-function-cast -Wno-comma -Wno-format-nonliteral \ -Wno-missing-prototypes -Wno-missing-variable-declarations \ @@ -100,7 +100,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2001/bellard/Makefile b/2001/bellard/Makefile index d58066ef3..a4565399d 100644 --- a/2001/bellard/Makefile +++ b/2001/bellard/Makefile @@ -83,7 +83,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-conditional-uninitialized -Wno-implicit-int-conversion \ -Wno-missing-prototypes -Wno-missing-variable-declarations -Wno-pedantic \ @@ -96,7 +96,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2001/cheong/Makefile b/2001/cheong/Makefile index 8bd06cd4e..e614f2a84 100644 --- a/2001/cheong/Makefile +++ b/2001/cheong/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-implicit-int-conversion -Wno-missing-variable-declarations \ -Wno-poison-system-directories -Wno-missing-prototypes @@ -92,7 +92,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2001/coupard/Makefile b/2001/coupard/Makefile index ce8c9b55f..4508fb462 100644 --- a/2001/coupard/Makefile +++ b/2001/coupard/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-implicit-int-conversion -Wno-missing-prototypes \ -Wno-missing-variable-declarations -Wno-pedantic \ @@ -93,7 +93,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2001/ctk/Makefile b/2001/ctk/Makefile index e626182db..91d990395 100644 --- a/2001/ctk/Makefile +++ b/2001/ctk/Makefile @@ -82,7 +82,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-cast-align -Wno-comma -Wno-implicit-int-conversion \ -Wno-missing-prototypes -Wno-missing-variable-declarations -Wno-pedantic \ @@ -94,7 +94,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2001/dgbeards/Makefile b/2001/dgbeards/Makefile index c5a2ba1f9..dc044135e 100644 --- a/2001/dgbeards/Makefile +++ b/2001/dgbeards/Makefile @@ -82,7 +82,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-conditional-uninitialized -Wno-format-nonliteral \ -Wno-implicit-int-conversion -Wno-missing-prototypes \ @@ -95,7 +95,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2001/herrmann1/Makefile b/2001/herrmann1/Makefile index 09359ea25..4712399a2 100644 --- a/2001/herrmann1/Makefile +++ b/2001/herrmann1/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # #CSILENCE+= # @@ -91,7 +91,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2001/herrmann2/Makefile b/2001/herrmann2/Makefile index 1804ef152..db7227e6f 100644 --- a/2001/herrmann2/Makefile +++ b/2001/herrmann2/Makefile @@ -84,7 +84,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-extra-semi -Wno-missing-variable-declarations \ -Wno-pedantic -Wno-pointer-arith -Wno-poison-system-directories \ @@ -97,7 +97,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2001/jason/Makefile b/2001/jason/Makefile index f020a3a27..22d4cc39f 100644 --- a/2001/jason/Makefile +++ b/2001/jason/Makefile @@ -82,7 +82,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-implicit-int-conversion -Wno-missing-prototypes \ -Wno-missing-variable-declarations -Wno-poison-system-directories \ @@ -95,7 +95,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2001/kev/Makefile b/2001/kev/Makefile index b71d87763..e0b3b8f86 100644 --- a/2001/kev/Makefile +++ b/2001/kev/Makefile @@ -83,7 +83,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-float-conversion -Wno-implicit-int-conversion -Wno-missing-prototypes \ -Wno-missing-variable-declarations -Wno-poison-system-directories \ @@ -95,7 +95,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2001/ollinger/Makefile b/2001/ollinger/Makefile index a48a25816..11dedb506 100644 --- a/2001/ollinger/Makefile +++ b/2001/ollinger/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-missing-variable-declarations \ -Wno-poison-system-directories -Wno-sign-conversion @@ -92,7 +92,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2001/rosten/Makefile b/2001/rosten/Makefile index ae9bd5158..e97494733 100644 --- a/2001/rosten/Makefile +++ b/2001/rosten/Makefile @@ -82,7 +82,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-double-promotion -Wno-float-conversion -Wno-float-equal \ -Wno-implicit-float-conversion -Wno-missing-prototypes \ @@ -95,7 +95,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2001/schweikh/Makefile b/2001/schweikh/Makefile index 02150b647..abfc0808f 100644 --- a/2001/schweikh/Makefile +++ b/2001/schweikh/Makefile @@ -82,7 +82,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-missing-prototypes -Wno-poison-system-directories # @@ -92,7 +92,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2001/westley/Makefile b/2001/westley/Makefile index bf5ac81c1..1d28e3cfb 100644 --- a/2001/westley/Makefile +++ b/2001/westley/Makefile @@ -84,7 +84,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-disabled-macro-expansion -Wno-extra-semi -Wno-missing-prototypes \ -Wno-missing-variable-declarations -Wno-pedantic \ @@ -96,7 +96,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2001/williams/Makefile b/2001/williams/Makefile index 8fda2649f..84f772309 100644 --- a/2001/williams/Makefile +++ b/2001/williams/Makefile @@ -84,7 +84,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-format-nonliteral -Wno-implicit-int-conversion \ -Wno-missing-prototypes -Wno-missing-variable-declarations \ @@ -97,7 +97,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2004/anonymous/Makefile b/2004/anonymous/Makefile index 60cc13e55..0d4647ab1 100644 --- a/2004/anonymous/Makefile +++ b/2004/anonymous/Makefile @@ -82,7 +82,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-float-conversion -Wno-missing-variable-declarations \ -Wno-poison-system-directories @@ -93,7 +93,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2004/arachnid/Makefile b/2004/arachnid/Makefile index cca7d47d2..74b13231d 100644 --- a/2004/arachnid/Makefile +++ b/2004/arachnid/Makefile @@ -82,7 +82,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-format-nonliteral -Wno-missing-prototypes \ -Wno-missing-variable-declarations -Wno-poison-system-directories \ @@ -94,7 +94,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2004/burley/Makefile b/2004/burley/Makefile index 39e2d80a3..32809731e 100644 --- a/2004/burley/Makefile +++ b/2004/burley/Makefile @@ -82,7 +82,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-bad-function-cast -Wno-comma -Wno-missing-variable-declarations \ -Wno-shift-sign-overflow -Wno-unknown-warning-option -Wno-poison-system-directories \ @@ -95,7 +95,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2004/gavare/Makefile b/2004/gavare/Makefile index 6da9ee81d..2406d83ae 100644 --- a/2004/gavare/Makefile +++ b/2004/gavare/Makefile @@ -82,7 +82,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-missing-prototypes -Wno-missing-variable-declarations \ -Wno-pedantic -Wno-poison-system-directories -Wno-shadow \ @@ -94,7 +94,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2004/gavin/Makefile b/2004/gavin/Makefile index 437c9a689..ab1f46d07 100644 --- a/2004/gavin/Makefile +++ b/2004/gavin/Makefile @@ -91,7 +91,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-implicit-int-conversion -Wno-missing-prototypes \ -Wno-poison-system-directories @@ -102,7 +102,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2004/hibachi/Makefile b/2004/hibachi/Makefile index ab2dd3817..852698e60 100644 --- a/2004/hibachi/Makefile +++ b/2004/hibachi/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-format-nonliteral -Wno-implicit-int-conversion -Wno-missing-prototypes \ -Wno-missing-variable-declarations -Wno-poison-system-directories \ @@ -93,7 +93,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2004/hoyle/Makefile b/2004/hoyle/Makefile index 3c0c95ebc..6f93e03ec 100644 --- a/2004/hoyle/Makefile +++ b/2004/hoyle/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-array-bounds-pointer-arithmetic -Wno-comma -Wno-float-conversion \ -Wno-missing-prototypes -Wno-missing-variable-declarations \ @@ -93,7 +93,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2004/jdalbec/Makefile b/2004/jdalbec/Makefile index fe6298353..e318bf898 100644 --- a/2004/jdalbec/Makefile +++ b/2004/jdalbec/Makefile @@ -82,7 +82,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-missing-variable-declarations -Wno-padded \ -Wno-poison-system-directories -Wno-sign-conversion -Wno-trigraphs @@ -93,7 +93,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2004/kopczynski/Makefile b/2004/kopczynski/Makefile index 456dbb37e..f5f3aed68 100644 --- a/2004/kopczynski/Makefile +++ b/2004/kopczynski/Makefile @@ -82,7 +82,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-conditional-uninitialized -Wno-pedantic -Wno-poison-system-directories # @@ -92,7 +92,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2004/newbern/Makefile b/2004/newbern/Makefile index 6b4d30a41..beda710d4 100644 --- a/2004/newbern/Makefile +++ b/2004/newbern/Makefile @@ -82,7 +82,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-array-bounds-pointer-arithmetic -Wno-missing-prototypes \ -Wno-missing-variable-declarations -Wno-poison-system-directories \ @@ -94,7 +94,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2004/omoikane/Makefile b/2004/omoikane/Makefile index 0a4f434dc..175aa560c 100644 --- a/2004/omoikane/Makefile +++ b/2004/omoikane/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-missing-prototypes -Wno-missing-variable-declarations \ -Wno-poison-system-directories -Wno-shorten-64-to-32 -Wno-sign-conversion \ @@ -93,7 +93,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2004/schnitzi/Makefile b/2004/schnitzi/Makefile index cb2ea7760..5c4e1308e 100644 --- a/2004/schnitzi/Makefile +++ b/2004/schnitzi/Makefile @@ -82,7 +82,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-conditional-uninitialized -Wno-missing-prototypes \ -Wno-poison-system-directories @@ -93,7 +93,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2004/sds/Makefile b/2004/sds/Makefile index 6a800f35a..54cf56012 100644 --- a/2004/sds/Makefile +++ b/2004/sds/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-missing-prototypes -Wno-missing-variable-declarations \ -Wno-poison-system-directories @@ -92,7 +92,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2004/vik1/Makefile b/2004/vik1/Makefile index 8de1c0dc0..6bc577abf 100644 --- a/2004/vik1/Makefile +++ b/2004/vik1/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-cast-align -Wno-comma -Wno-float-conversion \ -Wno-missing-variable-declarations -Wno-poison-system-directories \ @@ -93,7 +93,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2004/vik2/Makefile b/2004/vik2/Makefile index 5f9295b90..b2e5fefb6 100644 --- a/2004/vik2/Makefile +++ b/2004/vik2/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-poison-system-directories -Wno-unused-macros # @@ -91,7 +91,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2005/aidan/Makefile b/2005/aidan/Makefile index 8f6fc3e31..940272d10 100644 --- a/2005/aidan/Makefile +++ b/2005/aidan/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-disabled-macro-expansion -Wno-missing-variable-declarations \ -Wno-poison-system-directories @@ -92,7 +92,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2005/anon/Makefile b/2005/anon/Makefile index 62ad210d9..85050d3fe 100644 --- a/2005/anon/Makefile +++ b/2005/anon/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-cast-align -Wno-disabled-macro-expansion \ -Wno-poison-system-directories -Wno-shorten-64-to-32 @@ -92,7 +92,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2005/boutines/Makefile b/2005/boutines/Makefile index c202d3ee7..f6372b731 100644 --- a/2005/boutines/Makefile +++ b/2005/boutines/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-cast-qual -Wno-comma -Wno-implicit-int-conversion \ -Wno-missing-prototypes -Wno-missing-variable-declarations \ @@ -94,7 +94,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2005/chia/Makefile b/2005/chia/Makefile index 9ff9b65c5..8e66f2705 100644 --- a/2005/chia/Makefile +++ b/2005/chia/Makefile @@ -83,7 +83,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-disabled-macro-expansion -Wno-missing-prototypes \ -Wno-missing-variable-declarations -Wno-poison-system-directories \ @@ -95,7 +95,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2005/giljade/Makefile b/2005/giljade/Makefile index eaa49a3c7..501518bea 100644 --- a/2005/giljade/Makefile +++ b/2005/giljade/Makefile @@ -86,7 +86,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-format-nonliteral -Wno-missing-prototypes \ -Wno-missing-variable-declarations -Wno-poison-system-directories \ @@ -99,7 +99,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2005/jetro/Makefile b/2005/jetro/Makefile index a5e0243e4..8cad89a9d 100644 --- a/2005/jetro/Makefile +++ b/2005/jetro/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-cast-align -Wno-comma -Wno-double-promotion -Wno-missing-prototypes \ -Wno-missing-variable-declarations -Wno-padded \ @@ -94,7 +94,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2005/klausler/Makefile b/2005/klausler/Makefile index 2a693d68c..ccfc26814 100644 --- a/2005/klausler/Makefile +++ b/2005/klausler/Makefile @@ -82,7 +82,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-missing-prototypes -Wno-missing-variable-declarations \ -Wno-poison-system-directories -Wno-shorten-64-to-32 @@ -93,7 +93,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2005/mikeash/Makefile b/2005/mikeash/Makefile index 5f292024a..167ccf83d 100644 --- a/2005/mikeash/Makefile +++ b/2005/mikeash/Makefile @@ -82,7 +82,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-format-nonliteral -Wno-implicit-int-conversion -Wno-missing-prototypes \ -Wno-missing-variable-declarations -Wno-poison-system-directories \ @@ -94,7 +94,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2005/mynx/Makefile b/2005/mynx/Makefile index ef10c79d0..279c3fb7f 100644 --- a/2005/mynx/Makefile +++ b/2005/mynx/Makefile @@ -82,7 +82,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-format-nonliteral -Wno-implicit-int-conversion -Wno-missing-prototypes \ -Wno-missing-variable-declarations -Wno-poison-system-directories \ @@ -94,7 +94,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2005/persano/Makefile b/2005/persano/Makefile index 948292e87..f1d288314 100644 --- a/2005/persano/Makefile +++ b/2005/persano/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-conditional-uninitialized -Wno-float-conversion \ -Wno-implicit-int-conversion -Wno-missing-prototypes \ @@ -94,7 +94,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2005/sykes/Makefile b/2005/sykes/Makefile index b48901b93..e423f87c5 100644 --- a/2005/sykes/Makefile +++ b/2005/sykes/Makefile @@ -83,7 +83,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-implicit-int-conversion -Wno-missing-prototypes \ -Wno-missing-variable-declarations -Wno-pedantic \ @@ -96,7 +96,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2005/timwi/Makefile b/2005/timwi/Makefile index 2345887cd..b61dbfc73 100644 --- a/2005/timwi/Makefile +++ b/2005/timwi/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-missing-variable-declarations -Wno-poison-system-directories # @@ -91,7 +91,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2005/toledo/Makefile b/2005/toledo/Makefile index 0ef3d6ce1..fc4b423b6 100644 --- a/2005/toledo/Makefile +++ b/2005/toledo/Makefile @@ -82,7 +82,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-float-conversion -Wno-format-nonliteral -Wno-implicit-int-conversion \ -Wno-missing-variable-declarations -Wno-poison-system-directories @@ -93,7 +93,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2005/vik/Makefile b/2005/vik/Makefile index 9768d56f0..d0f7867a2 100644 --- a/2005/vik/Makefile +++ b/2005/vik/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-implicit-float-conversion -Wno-implicit-int-conversion \ -Wno-missing-variable-declarations -Wno-poison-system-directories \ @@ -93,7 +93,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2005/vince/Makefile b/2005/vince/Makefile index 5fa3e91bf..86541cdd3 100644 --- a/2005/vince/Makefile +++ b/2005/vince/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-float-conversion -Wno-implicit-float-conversion \ -Wno-missing-prototypes -Wno-missing-variable-declarations -Wno-padded \ @@ -94,7 +94,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2006/birken/Makefile b/2006/birken/Makefile index 14bccb966..459320fd2 100644 --- a/2006/birken/Makefile +++ b/2006/birken/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-conditional-uninitialized -Wno-format-nonliteral \ -Wno-implicit-int-conversion -Wno-missing-prototypes \ @@ -94,7 +94,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2006/borsanyi/Makefile b/2006/borsanyi/Makefile index 34493f640..c7c1994f4 100644 --- a/2006/borsanyi/Makefile +++ b/2006/borsanyi/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-implicit-int-conversion -Wno-missing-prototypes \ -Wno-missing-variable-declarations -Wno-poison-system-directories @@ -92,7 +92,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2006/grothe/Makefile b/2006/grothe/Makefile index 95dc29944..437610c04 100644 --- a/2006/grothe/Makefile +++ b/2006/grothe/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-poison-system-directories # @@ -91,7 +91,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2006/hamre/Makefile b/2006/hamre/Makefile index 59d97a031..4011ad018 100644 --- a/2006/hamre/Makefile +++ b/2006/hamre/Makefile @@ -82,7 +82,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-poison-system-directories # @@ -92,7 +92,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2006/meyer/Makefile b/2006/meyer/Makefile index 06176fff2..a80f159c6 100644 --- a/2006/meyer/Makefile +++ b/2006/meyer/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-missing-prototypes -Wno-missing-variable-declarations \ -Wno-poison-system-directories -Wno-sign-conversion -Wno-strict-prototypes @@ -92,7 +92,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2006/monge/Makefile b/2006/monge/Makefile index 27a8d5677..fafdb8705 100644 --- a/2006/monge/Makefile +++ b/2006/monge/Makefile @@ -85,7 +85,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-cast-align -Wno-comma -Wno-double-promotion -Wno-float-conversion \ -Wno-implicit-float-conversion -Wno-implicit-int-conversion \ @@ -99,7 +99,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2006/night/Makefile b/2006/night/Makefile index a9936b26b..874d4f45b 100644 --- a/2006/night/Makefile +++ b/2006/night/Makefile @@ -85,7 +85,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-declaration-after-statement -Wno-implicit-int-conversion \ -Wno-missing-prototypes -Wno-missing-variable-declarations -Wno-shadow \ @@ -97,7 +97,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2006/sloane/Makefile b/2006/sloane/Makefile index 8d60e15da..849aa181d 100644 --- a/2006/sloane/Makefile +++ b/2006/sloane/Makefile @@ -83,7 +83,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-double-promotion -Wno-float-conversion \ -Wno-implicit-float-conversion -Wno-implicit-int-conversion \ @@ -96,7 +96,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2006/stewart/Makefile b/2006/stewart/Makefile index 1abe7277b..a51224023 100644 --- a/2006/stewart/Makefile +++ b/2006/stewart/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-bad-function-cast -Wno-comma -Wno-poison-system-directories \ -Wno-sign-conversion @@ -92,7 +92,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2006/sykes1/Makefile b/2006/sykes1/Makefile index e6849bd65..811f3f5e5 100644 --- a/2006/sykes1/Makefile +++ b/2006/sykes1/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-conditional-uninitialized -Wno-missing-variable-declarations \ -Wno-poison-system-directories -Wno-sign-conversion @@ -92,7 +92,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2006/sykes2/Makefile b/2006/sykes2/Makefile index 9afe744b7..6157b5b50 100644 --- a/2006/sykes2/Makefile +++ b/2006/sykes2/Makefile @@ -83,7 +83,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-array-bounds-pointer-arithmetic -Wno-date-time \ -Wno-poison-system-directories @@ -94,7 +94,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2006/toledo1/Makefile b/2006/toledo1/Makefile index 5e90f2577..fcd2837bd 100644 --- a/2006/toledo1/Makefile +++ b/2006/toledo1/Makefile @@ -83,7 +83,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-implicit-int-conversion -Wno-missing-variable-declarations \ -Wno-poison-system-directories @@ -94,7 +94,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2006/toledo2/Makefile b/2006/toledo2/Makefile index ba66ba588..5058b8d1b 100644 --- a/2006/toledo2/Makefile +++ b/2006/toledo2/Makefile @@ -84,7 +84,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-implicit-int-conversion -Wno-missing-variable-declarations \ -Wno-pedantic -Wno-poison-system-directories -Wno-shorten-64-to-32 \ @@ -96,7 +96,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2006/toledo3/Makefile b/2006/toledo3/Makefile index 4f34937d4..0eed2e62d 100644 --- a/2006/toledo3/Makefile +++ b/2006/toledo3/Makefile @@ -85,7 +85,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-conditional-uninitialized -Wno-float-conversion \ -Wno-missing-prototypes -Wno-missing-variable-declarations -Wno-pedantic \ @@ -98,7 +98,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2011/akari/Makefile b/2011/akari/Makefile index ca37c744d..3dbf7fcbc 100644 --- a/2011/akari/Makefile +++ b/2011/akari/Makefile @@ -83,7 +83,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-conditional-uninitialized -Wno-error \ -Wno-implicit-function-declaration -Wno-format-nonliteral \ @@ -98,7 +98,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2011/blakely/Makefile b/2011/blakely/Makefile index 66c652257..2dd6068c1 100644 --- a/2011/blakely/Makefile +++ b/2011/blakely/Makefile @@ -82,7 +82,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-error -Wno-implicit-function-declaration \ -Wno-implicit-int-conversion -Wno-logical-op-parentheses \ @@ -96,7 +96,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2011/borsanyi/Makefile b/2011/borsanyi/Makefile index 3485607c2..b03e9b2d7 100644 --- a/2011/borsanyi/Makefile +++ b/2011/borsanyi/Makefile @@ -83,7 +83,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-missing-prototypes -Wno-missing-variable-declarations \ -Wno-pedantic -Wno-poison-system-directories @@ -94,7 +94,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2011/dlowe/Makefile b/2011/dlowe/Makefile index ac1716488..aff0b9811 100644 --- a/2011/dlowe/Makefile +++ b/2011/dlowe/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-conditional-uninitialized -Wno-double-promotion \ -Wno-implicit-float-conversion -Wno-missing-prototypes \ @@ -94,7 +94,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2011/eastman/Makefile b/2011/eastman/Makefile index e5c766c86..c9fa2ea03 100644 --- a/2011/eastman/Makefile +++ b/2011/eastman/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-double-promotion -Wno-implicit-float-conversion \ -Wno-poison-system-directories -Wno-declaration-after-statement @@ -92,7 +92,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2011/fredriksson/Makefile b/2011/fredriksson/Makefile index c62ecc89a..5dc05a5b1 100644 --- a/2011/fredriksson/Makefile +++ b/2011/fredriksson/Makefile @@ -82,7 +82,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-format-nonliteral -Wno-missing-variable-declarations \ -Wno-poison-system-directories -Wno-string-conversion -Wno-unreachable-code @@ -93,7 +93,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2011/goren/Makefile b/2011/goren/Makefile index f816e0685..3f0d60e2f 100644 --- a/2011/goren/Makefile +++ b/2011/goren/Makefile @@ -84,7 +84,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-array-bounds-pointer-arithmetic -Wno-comma -Wno-format-nonliteral \ -Wno-implicit-int-conversion -Wno-missing-prototypes \ @@ -97,7 +97,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2011/hamaji/Makefile b/2011/hamaji/Makefile index bc9de0792..3b58b7ff0 100644 --- a/2011/hamaji/Makefile +++ b/2011/hamaji/Makefile @@ -82,7 +82,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-missing-prototypes -Wno-missing-variable-declarations \ -Wno-poison-system-directories -Wno-shorten-64-to-32 -Wno-strict-prototypes @@ -93,7 +93,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2011/hou/Makefile b/2011/hou/Makefile index 57dd114a5..a7a11a9af 100644 --- a/2011/hou/Makefile +++ b/2011/hou/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-disabled-macro-expansion -Wno-float-conversion \ -Wno-missing-variable-declarations -Wno-poison-system-directories @@ -92,7 +92,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2011/konno/Makefile b/2011/konno/Makefile index 18fc9e6e8..f5e5079c5 100644 --- a/2011/konno/Makefile +++ b/2011/konno/Makefile @@ -83,7 +83,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-poison-system-directories # @@ -93,7 +93,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2011/richards/Makefile b/2011/richards/Makefile index d637791f6..00d93a354 100644 --- a/2011/richards/Makefile +++ b/2011/richards/Makefile @@ -82,7 +82,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-cast-align -Wno-missing-prototypes -Wno-missing-variable-declarations \ -Wno-pedantic -Wno-poison-system-directories -Wno-shadow \ @@ -95,7 +95,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2011/toledo/Makefile b/2011/toledo/Makefile index 28137fa6e..e268ac1aa 100644 --- a/2011/toledo/Makefile +++ b/2011/toledo/Makefile @@ -86,7 +86,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-disabled-macro-expansion -Wno-double-promotion \ -Wno-float-conversion -Wno-implicit-float-conversion \ @@ -100,7 +100,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2011/vik/Makefile b/2011/vik/Makefile index 634433a40..09339f038 100644 --- a/2011/vik/Makefile +++ b/2011/vik/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-missing-variable-declarations -Wno-poison-system-directories \ -Wno-shorten-64-to-32 -Wno-sign-conversion @@ -92,7 +92,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2011/zucker/Makefile b/2011/zucker/Makefile index 486083f63..157350e03 100644 --- a/2011/zucker/Makefile +++ b/2011/zucker/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-double-promotion -Wno-float-conversion \ -Wno-implicit-float-conversion -Wno-missing-prototypes \ @@ -94,7 +94,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2012/blakely/Makefile b/2012/blakely/Makefile index 2dae22152..8fe926c89 100644 --- a/2012/blakely/Makefile +++ b/2012/blakely/Makefile @@ -82,7 +82,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-float-conversion -Wno-float-equal \ -Wno-implicit-int-conversion -Wno-missing-prototypes \ @@ -95,7 +95,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2012/deckmyn/Makefile b/2012/deckmyn/Makefile index 0dadecc3f..b62ca46c5 100644 --- a/2012/deckmyn/Makefile +++ b/2012/deckmyn/Makefile @@ -82,7 +82,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-cast-align -Wno-comma -Wno-implicit-int-conversion \ -Wno-poison-system-directorie -Wno-unknown-warning-option \ @@ -94,7 +94,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2012/dlowe/Makefile b/2012/dlowe/Makefile index f109b34de..5963ddeed 100644 --- a/2012/dlowe/Makefile +++ b/2012/dlowe/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-missing-prototypes -Wno-missing-variable-declarations \ -Wno-poison-system-directories -Wno-shadow -Wno-shorten-64-to-32 \ @@ -93,7 +93,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2012/endoh1/Makefile b/2012/endoh1/Makefile index 54bd34a03..81326947a 100644 --- a/2012/endoh1/Makefile +++ b/2012/endoh1/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-conversion -Wno-double-promotion -Wno-missing-prototypes \ -Wno-missing-variable-declarations -Wno-poison-system-directories \ @@ -93,7 +93,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2012/endoh2/Makefile b/2012/endoh2/Makefile index 79459a5c5..98b4669ad 100644 --- a/2012/endoh2/Makefile +++ b/2012/endoh2/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-format-nonliteral -Wno-missing-variable-declarations \ -Wno-poison-system-directories -Wno-float-conversion -Wno-implicit-int-conversion @@ -92,7 +92,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2012/grothe/Makefile b/2012/grothe/Makefile index f8b9cc5ba..6c69e945f 100644 --- a/2012/grothe/Makefile +++ b/2012/grothe/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-missing-prototypes -Wno-missing-variable-declarations \ -Wno-poison-system-directories -Wno-shadow -Wno-missing-noreturn \ @@ -93,7 +93,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2012/hamano/Makefile b/2012/hamano/Makefile index 70bad793c..26f939ee0 100644 --- a/2012/hamano/Makefile +++ b/2012/hamano/Makefile @@ -83,7 +83,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-double-promotion -Wno-missing-prototypes \ -Wno-missing-variable-declarations -Wno-poison-system-directories \ @@ -95,7 +95,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2012/hou/Makefile b/2012/hou/Makefile index 5c38c7856..9efdf29cb 100644 --- a/2012/hou/Makefile +++ b/2012/hou/Makefile @@ -84,7 +84,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-format-nonliteral -Wno-implicit-int-conversion \ -Wno-keyword-macro -Wno-missing-prototypes \ @@ -98,7 +98,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2012/kang/Makefile b/2012/kang/Makefile index a8b6a22e2..23ad0a15d 100644 --- a/2012/kang/Makefile +++ b/2012/kang/Makefile @@ -83,7 +83,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-missing-variable-declarations -Wno-pedantic \ -Wno-poison-system-directories @@ -94,7 +94,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2012/konno/Makefile b/2012/konno/Makefile index bf5d3f224..47f3bf4a7 100644 --- a/2012/konno/Makefile +++ b/2012/konno/Makefile @@ -84,7 +84,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-missing-variable-declarations -Wno-pedantic \ -Wno-poison-system-directories @@ -95,7 +95,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2012/omoikane/Makefile b/2012/omoikane/Makefile index 26aac4596..4eb7230d7 100644 --- a/2012/omoikane/Makefile +++ b/2012/omoikane/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-implicit-int-conversion -Wno-missing-prototypes \ -Wno-missing-variable-declarations -Wno-poison-system-directories \ @@ -93,7 +93,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2012/tromp/Makefile b/2012/tromp/Makefile index d39df946b..3f7bef416 100644 --- a/2012/tromp/Makefile +++ b/2012/tromp/Makefile @@ -84,7 +84,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-implicit-int-conversion -Wno-missing-prototypes \ -Wno-missing-variable-declarations -Wno-pedantic \ @@ -97,7 +97,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2012/vik/Makefile b/2012/vik/Makefile index 4f461c484..42a232da4 100644 --- a/2012/vik/Makefile +++ b/2012/vik/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-implicit-int-conversion -Wno-missing-variable-declarations \ -Wno-poison-system-directories -Wno-shorten-64-to-32 -Wno-sign-conversion @@ -92,7 +92,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2012/zeitak/Makefile b/2012/zeitak/Makefile index f961f8071..018ce6f8c 100644 --- a/2012/zeitak/Makefile +++ b/2012/zeitak/Makefile @@ -84,7 +84,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-bad-function-cast -Wno-cast-align -Wno-comma -Wno-missing-prototypes \ -Wno-missing-variable-declarations -Wno-pedantic \ @@ -96,7 +96,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2013/birken/Makefile b/2013/birken/Makefile index a9d285c37..cfaad4e95 100644 --- a/2013/birken/Makefile +++ b/2013/birken/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-conditional-uninitialized -Wno-missing-prototypes \ -Wno-missing-variable-declarations -Wno-poison-system-directories \ @@ -93,7 +93,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2013/cable1/Makefile b/2013/cable1/Makefile index 9e2a13a0c..6dde4a935 100644 --- a/2013/cable1/Makefile +++ b/2013/cable1/Makefile @@ -82,7 +82,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-cast-align -Wno-poison-system-directories # @@ -92,7 +92,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2013/cable2/Makefile b/2013/cable2/Makefile index 4a58bc7e2..55e8b78df 100644 --- a/2013/cable2/Makefile +++ b/2013/cable2/Makefile @@ -84,7 +84,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-cast-align -Wno-comma -Wno-format-nonliteral \ -Wno-implicit-int-conversion -Wno-missing-variable-declarations \ @@ -96,7 +96,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2013/cable3/Makefile b/2013/cable3/Makefile index 881b6a959..5e742bdf8 100644 --- a/2013/cable3/Makefile +++ b/2013/cable3/Makefile @@ -87,7 +87,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-cast-align -Wno-comma -Wno-dollar-in-identifier-extension \ -Wno-implicit-int-conversion -Wno-missing-prototypes \ @@ -101,7 +101,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2013/dlowe/Makefile b/2013/dlowe/Makefile index 5af20b634..41117fbab 100644 --- a/2013/dlowe/Makefile +++ b/2013/dlowe/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-float-conversion -Wno-poison-system-directories # @@ -91,7 +91,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2013/endoh1/Makefile b/2013/endoh1/Makefile index c331d4385..20bf48914 100644 --- a/2013/endoh1/Makefile +++ b/2013/endoh1/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-conditional-uninitialized -Wno-missing-prototypes \ -Wno-missing-variable-declarations -Wno-poison-system-directories \ @@ -94,7 +94,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2013/endoh2/Makefile b/2013/endoh2/Makefile index 6cfa0d747..2828d0af0 100644 --- a/2013/endoh2/Makefile +++ b/2013/endoh2/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-float-conversion -Wno-implicit-int-conversion \ -Wno-missing-prototypes -Wno-missing-variae-declarations \ @@ -94,7 +94,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2013/endoh3/Makefile b/2013/endoh3/Makefile index 523105ad1..18cc7c52f 100644 --- a/2013/endoh3/Makefile +++ b/2013/endoh3/Makefile @@ -82,7 +82,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-double-promotion -Wno-float-conversion \ -Wno-implicit-float-conversion -Wno-missing-variable-declarations \ @@ -94,7 +94,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2013/endoh4/Makefile b/2013/endoh4/Makefile index 567fe4ad9..6fb0a5bc0 100644 --- a/2013/endoh4/Makefile +++ b/2013/endoh4/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-float-conversion -Wno-missing-prototypes \ -Wno-missing-variable-declarations -Wno-poison-system-directories \ @@ -93,7 +93,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2013/hou/Makefile b/2013/hou/Makefile index 8f3423a4a..d6f13a533 100644 --- a/2013/hou/Makefile +++ b/2013/hou/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-implicit-int-conversion -Wno-missing-variable-declarations \ -Wno-poison-system-directories -Wno-shorten-64-to-32 @@ -92,7 +92,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2013/mills/Makefile b/2013/mills/Makefile index 2aa81a573..baeef76a5 100644 --- a/2013/mills/Makefile +++ b/2013/mills/Makefile @@ -82,7 +82,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-double-promotion -Wno-float-conversion \ -Wno-implicit-float-conversion -Wno-implicit-int-conversion \ @@ -96,7 +96,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2013/misaka/Makefile b/2013/misaka/Makefile index 05777ccfd..613a195fb 100644 --- a/2013/misaka/Makefile +++ b/2013/misaka/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-documentation -Wno-format-nonliteral -Wno-missing-prototypes \ -Wno-missing-variable-declarations -Wno-poison-system-directories \ @@ -94,7 +94,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2013/morgan1/Makefile b/2013/morgan1/Makefile index bb280a57c..5a933f609 100644 --- a/2013/morgan1/Makefile +++ b/2013/morgan1/Makefile @@ -82,7 +82,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-conditional-uninitialized -Wno-float-conversion \ -Wno-format-nonliteral -Wno-poison-system-directories -Wno-shorten-64-to-32 @@ -93,7 +93,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2013/morgan2/Makefile b/2013/morgan2/Makefile index 4c1af15df..4c86044b1 100644 --- a/2013/morgan2/Makefile +++ b/2013/morgan2/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-format-nonliteral -Wno-missing-prototypes \ -Wno-missing-variable-declarations -Wno-poison-system-directories \ @@ -93,7 +93,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2013/robison/Makefile b/2013/robison/Makefile index 90b0a820c..7ea7b498b 100644 --- a/2013/robison/Makefile +++ b/2013/robison/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-cast-qual -Wno-comma -Wno-disabled-macro-expansion \ -Wno-implicit-int-conversion -Wno-missing-prototypes \ @@ -95,7 +95,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2014/birken/Makefile b/2014/birken/Makefile index 6e69370d5..01fdaf52a 100644 --- a/2014/birken/Makefile +++ b/2014/birken/Makefile @@ -83,7 +83,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-format-nonliteral -Wno-implicit-int-conversion \ -Wno-missing-prototypes -Wno-missing-variable-declarations \ @@ -95,7 +95,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2014/deak/Makefile b/2014/deak/Makefile index beddc2514..6ae6ef373 100644 --- a/2014/deak/Makefile +++ b/2014/deak/Makefile @@ -82,7 +82,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-float-equal -Wno-missing-variable-declarations \ -Wno-poison-system-directories -Wno-declaration-after-statement @@ -93,7 +93,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2014/endoh1/Makefile b/2014/endoh1/Makefile index b5190dddd..e54295893 100644 --- a/2014/endoh1/Makefile +++ b/2014/endoh1/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-missing-variable-declarations \ -Wno-poison-system-directories -Wno-shadow @@ -92,7 +92,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2014/endoh2/Makefile b/2014/endoh2/Makefile index ddd294ad4..eab511791 100644 --- a/2014/endoh2/Makefile +++ b/2014/endoh2/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-missing-prototypes -Wno-missing-variable-declarations \ -Wno-poison-system-directories -Wno-unused-macros @@ -92,7 +92,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2014/maffiodo1/Makefile b/2014/maffiodo1/Makefile index 1e99215b6..8650fddc4 100644 --- a/2014/maffiodo1/Makefile +++ b/2014/maffiodo1/Makefile @@ -85,7 +85,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-documentation -Wno-extra-semi -Wno-implicit-int \ -Wno-missing-prototypes -Wno-missing-variable-declarations -Wno-padded \ @@ -99,7 +99,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2014/maffiodo2/Makefile b/2014/maffiodo2/Makefile index a58a4c33a..29c3b42b2 100644 --- a/2014/maffiodo2/Makefile +++ b/2014/maffiodo2/Makefile @@ -82,7 +82,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-missing-prototypes -Wno-missing-variable-declarations -Wno-pedantic \ -Wno-poison-system-directories -Wno-sign-conversion -Wno-strict-prototypes @@ -93,7 +93,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2014/morgan/Makefile b/2014/morgan/Makefile index f83fd0289..263f58dfe 100644 --- a/2014/morgan/Makefile +++ b/2014/morgan/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-missing-prototypes -Wno-missing-variable-declarations \ -Wno-poison-system-directories -Wno-shorten-64-to-32 -Wno-sign-conversion \ @@ -93,7 +93,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2014/sinon/Makefile b/2014/sinon/Makefile index 98f121d6e..90162f364 100644 --- a/2014/sinon/Makefile +++ b/2014/sinon/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-date-time -Wno-missing-prototypes -Wno-missing-variable-declarations \ -Wno-poison-system-directories -Wno-shadow -Wno-strict-prototypes @@ -92,7 +92,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2014/skeggs/Makefile b/2014/skeggs/Makefile index ccf004acb..47d9319f4 100644 --- a/2014/skeggs/Makefile +++ b/2014/skeggs/Makefile @@ -82,7 +82,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-class-varargs -Wno-missing-prototypes \ -Wno-missing-variable-declarations -Wno-poison-system-directories \ @@ -95,7 +95,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2014/vik/Makefile b/2014/vik/Makefile index b227bac79..bd681a676 100644 --- a/2014/vik/Makefile +++ b/2014/vik/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-implicit-int-conversion -Wno-missing-variable-declarations \ -Wno-poison-system-directories -Wno-shorten-64-to-32 @@ -92,7 +92,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2014/wiedijk/Makefile b/2014/wiedijk/Makefile index d6f7467c2..fe963e3bc 100644 --- a/2014/wiedijk/Makefile +++ b/2014/wiedijk/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-missing-prototypes -Wno-missing-variable-declarations \ -Wno-poison-system-directories -Wno-redundant-parens @@ -92,7 +92,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2015/burton/Makefile b/2015/burton/Makefile index 83af8f7dc..e8fa8ae79 100644 --- a/2015/burton/Makefile +++ b/2015/burton/Makefile @@ -83,7 +83,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-cast-align -Wno-comma -Wno-implicit-int-conversion \ -Wno-missing-prototypes -Wno-missing-variable-declarations \ @@ -96,7 +96,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2015/dogon/Makefile b/2015/dogon/Makefile index 677fb54bd..eec33323e 100644 --- a/2015/dogon/Makefile +++ b/2015/dogon/Makefile @@ -83,7 +83,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-double-promotion -Wno-float-conversion -Wno-implicit-float-conversion \ @@ -96,7 +96,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2015/duble/Makefile b/2015/duble/Makefile index e73b05a9b..61f648426 100644 --- a/2015/duble/Makefile +++ b/2015/duble/Makefile @@ -84,7 +84,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-cast-align -Wno-comma -Wno-disabled-macro-expansion \ -Wno-format-nonliteral -Wno-missing-prototypes \ @@ -97,7 +97,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2015/endoh1/Makefile b/2015/endoh1/Makefile index c2846f540..87ca869c4 100644 --- a/2015/endoh1/Makefile +++ b/2015/endoh1/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-double-promotion -Wno-float-conversion \ -Wno-implicit-float-conversion -Wno-implicit-int-conversion \ @@ -95,7 +95,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2015/endoh2/Makefile b/2015/endoh2/Makefile index fb586bb50..f4e82e7f0 100644 --- a/2015/endoh2/Makefile +++ b/2015/endoh2/Makefile @@ -82,7 +82,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-format-nonliteral -Wno-poison-system-directories # @@ -92,7 +92,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2015/endoh3/Makefile b/2015/endoh3/Makefile index 1942b4f2e..6591b7a91 100644 --- a/2015/endoh3/Makefile +++ b/2015/endoh3/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-cast-align -Wno-missing-prototypes -Wno-missing-variable-declarations \ -Wno-poison-system-directories -Wno-shorten-64-to-32 -Wno-strict-prototypes \ @@ -93,7 +93,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2015/endoh4/Makefile b/2015/endoh4/Makefile index 06b3fa500..a10e04ce4 100644 --- a/2015/endoh4/Makefile +++ b/2015/endoh4/Makefile @@ -82,7 +82,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-missing-prototypes -Wno-poison-system-directories \ -Wno-strict-prototypes @@ -93,7 +93,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2015/hou/Makefile b/2015/hou/Makefile index 3c43cbafc..66000a126 100644 --- a/2015/hou/Makefile +++ b/2015/hou/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-cast-qual -Wno-missing-prototypes -Wno-missing-variable-declarations \ -Wno-poison-system-directories -Wno-shadow @@ -92,7 +92,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2015/howe/Makefile b/2015/howe/Makefile index eab165669..a2ce6fa35 100644 --- a/2015/howe/Makefile +++ b/2015/howe/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-missing-prototypes -Wno-missing-variable-declarations -Wno-padded \ -Wno-poison-system-directories -Wno-shadow -Wno-shorten-64-to-32 \ @@ -93,7 +93,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2015/mills1/Makefile b/2015/mills1/Makefile index 325f9f3ba..091008680 100644 --- a/2015/mills1/Makefile +++ b/2015/mills1/Makefile @@ -83,7 +83,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-missing-variable-declarations -Wno-poison-system-directories # @@ -93,7 +93,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2015/mills2/Makefile b/2015/mills2/Makefile index 3ddec84d5..420bbbd7b 100644 --- a/2015/mills2/Makefile +++ b/2015/mills2/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-missing-prototypes -Wno-missing-variable-declarations \ -Wno-poison-system-directories -Wno-shadow @@ -92,7 +92,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2015/muth/Makefile b/2015/muth/Makefile index eb56f9abb..8efe41e75 100644 --- a/2015/muth/Makefile +++ b/2015/muth/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-poison-system-directories -Wno-unused-macros # @@ -91,7 +91,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2015/schweikhardt/Makefile b/2015/schweikhardt/Makefile index 6a01ef7d9..3d4f9d872 100644 --- a/2015/schweikhardt/Makefile +++ b/2015/schweikhardt/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-poison-system-directories # @@ -91,7 +91,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2015/yang/Makefile b/2015/yang/Makefile index 8bbdd3e20..441398481 100644 --- a/2015/yang/Makefile +++ b/2015/yang/Makefile @@ -82,7 +82,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-c99-compat -Wno-comma -Wno-double-promotion -Wno-float-conversion \ -Wno-implicit-float-conversion -Wno-missing-prototypes \ @@ -96,7 +96,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2018/algmyr/Makefile b/2018/algmyr/Makefile index ce19ba5f0..880403ec6 100644 --- a/2018/algmyr/Makefile +++ b/2018/algmyr/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-float-conversion -Wno-float-equal -Wno-format-nonliteral \ -Wno-implicit-float-conversion -Wno-missing-prototypes \ @@ -95,7 +95,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2018/anderson/Makefile b/2018/anderson/Makefile index 472ccc7fe..f6fb6222b 100644 --- a/2018/anderson/Makefile +++ b/2018/anderson/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-implicit-int-conversion -Wno-missing-variable-declarations \ -Wno-poison-system-directories -Wno-vla @@ -92,7 +92,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2018/bellard/Makefile b/2018/bellard/Makefile index 06d5fd732..713a0809e 100644 --- a/2018/bellard/Makefile +++ b/2018/bellard/Makefile @@ -83,7 +83,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-conditional-uninitialized -Wno-missing-prototypes \ -Wno-missing-variable-declarations -Wno-poison-system-directories \ @@ -95,7 +95,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2018/burton1/Makefile b/2018/burton1/Makefile index 8a91b5c35..59efaddc4 100644 --- a/2018/burton1/Makefile +++ b/2018/burton1/Makefile @@ -82,7 +82,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-implicit-int-conversion -Wno-missing-variable-declarations \ -Wno-pedantic -Wno-poison-system-directories @@ -93,7 +93,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2018/burton2/Makefile b/2018/burton2/Makefile index 67bdb44d2..8a814c5da 100644 --- a/2018/burton2/Makefile +++ b/2018/burton2/Makefile @@ -83,7 +83,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-cast-align -Wno-comma -Wno-extra-semi -Wno-implicit-int-conversion \ -Wno-missing-prototypes -Wno-missing-variable-declarations -Wno-pedantic \ @@ -96,7 +96,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2018/ciura/Makefile b/2018/ciura/Makefile index 1ef25fcb5..945c9464d 100644 --- a/2018/ciura/Makefile +++ b/2018/ciura/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-missing-prototypes -Wno-poison-system-directories \ -Wno-sign-conversion @@ -92,7 +92,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2018/endoh1/Makefile b/2018/endoh1/Makefile index 2cb384ebb..464b03dd7 100644 --- a/2018/endoh1/Makefile +++ b/2018/endoh1/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-implicit-int-conversion -Wno-missing-prototypes \ -Wno-missing-variable-declarations -Wno-poison-system-directories \ @@ -93,7 +93,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2018/endoh2/Makefile b/2018/endoh2/Makefile index e26c0d347..c65b60cac 100644 --- a/2018/endoh2/Makefile +++ b/2018/endoh2/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-missing-variable-declarations -Wno-poison-system-directories # @@ -91,7 +91,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2018/ferguson/Makefile b/2018/ferguson/Makefile index a5c360050..d3ccf57e2 100644 --- a/2018/ferguson/Makefile +++ b/2018/ferguson/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-padded -Wno-poison-system-directories # @@ -91,7 +91,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2018/giles/Makefile b/2018/giles/Makefile index 67ea74fd0..d60a25227 100644 --- a/2018/giles/Makefile +++ b/2018/giles/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-poison-system-directories -Wno-float-conversion -Wno-missing-prototypes \ -Wno-missing-variable-declarations -Wno-padded -Wno-declaration-after-statement @@ -92,7 +92,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2018/hou/Makefile b/2018/hou/Makefile index c4614051e..5f0fb83cb 100644 --- a/2018/hou/Makefile +++ b/2018/hou/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-float-conversion -Wno-format-nonliteral -Wno-missing-prototypes \ -Wno-poison-system-directories -Wno-strict-prototypes @@ -92,7 +92,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2018/mills/Makefile b/2018/mills/Makefile index 4e9a0a066..f65bf95c9 100644 --- a/2018/mills/Makefile +++ b/2018/mills/Makefile @@ -82,7 +82,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-implicit-int-conversion -Wno-missing-variable-declarations \ -Wno-poison-system-directories -Wno-shorten-64-to-32 @@ -93,7 +93,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2018/poikola/Makefile b/2018/poikola/Makefile index a33e853bf..e9232da77 100644 --- a/2018/poikola/Makefile +++ b/2018/poikola/Makefile @@ -82,7 +82,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-date-time -Wno-float-conversion \ -Wno-implicit-float-conversion -Wno-missing-prototypes \ @@ -95,7 +95,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2018/vokes/Makefile b/2018/vokes/Makefile index 14d6e7756..43fe53572 100644 --- a/2018/vokes/Makefile +++ b/2018/vokes/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-missing-prototypes -Wno-poison-system-directories \ -Wno-strict-prototypes @@ -92,7 +92,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2018/yang/Makefile b/2018/yang/Makefile index 3920df478..ca0e105fc 100644 --- a/2018/yang/Makefile +++ b/2018/yang/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-implicit-int-conversion -Wno-missing-variable-declarations \ -Wno-poison-system-directories -Wno-sign-conversion -Wno-unused-macros @@ -92,7 +92,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2019/adamovsky/Makefile b/2019/adamovsky/Makefile index 18997b3f0..efaf49e05 100644 --- a/2019/adamovsky/Makefile +++ b/2019/adamovsky/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-missing-noreturn -Wno-missing-prototypes \ -Wno-missing-variable-declarations -Wno-poison-system-directories \ @@ -94,7 +94,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2019/burton/Makefile b/2019/burton/Makefile index d90e29cb3..3d6643581 100644 --- a/2019/burton/Makefile +++ b/2019/burton/Makefile @@ -82,7 +82,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-missing-variable-declarations -Wno-poison-system-directories # @@ -92,7 +92,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2019/ciura/Makefile b/2019/ciura/Makefile index 91014fc03..4d37080e5 100644 --- a/2019/ciura/Makefile +++ b/2019/ciura/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-format-nonliteral -Wno-poison-system-directories \ -Wno-shorten-64-to-32 @@ -92,7 +92,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2019/diels-grabsch1/Makefile b/2019/diels-grabsch1/Makefile index 877df11c5..632c90823 100644 --- a/2019/diels-grabsch1/Makefile +++ b/2019/diels-grabsch1/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-poison-system-directories # @@ -91,7 +91,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2019/diels-grabsch2/Makefile b/2019/diels-grabsch2/Makefile index c740e6bed..3e2939925 100644 --- a/2019/diels-grabsch2/Makefile +++ b/2019/diels-grabsch2/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-poison-system-directories # @@ -91,7 +91,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2019/dogon/Makefile b/2019/dogon/Makefile index c5a292cf4..9ba143459 100644 --- a/2019/dogon/Makefile +++ b/2019/dogon/Makefile @@ -85,7 +85,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-cast-align -Wno-comma -Wno-conditional-uninitialized \ -Wno-missing-prototypes -Wno-missing-variable-declarations \ @@ -98,7 +98,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2019/duble/Makefile b/2019/duble/Makefile index 03d1d4b20..e1c9c0fc7 100644 --- a/2019/duble/Makefile +++ b/2019/duble/Makefile @@ -84,7 +84,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-bad-function-cast -Wno-comma -Wno-implicit-int-conversion \ -Wno-missing-prototypes -Wno-missing-variable-declarations -Wno-shadow \ @@ -96,7 +96,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2019/endoh/Makefile b/2019/endoh/Makefile index a5993a58a..dd360a865 100644 --- a/2019/endoh/Makefile +++ b/2019/endoh/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-missing-prototypes -Wno-missing-variable-declarations \ -Wno-poison-system-directories -Wno-strict-prototypes @@ -92,7 +92,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2019/giles/Makefile b/2019/giles/Makefile index 1ac92481c..3f59d0abc 100644 --- a/2019/giles/Makefile +++ b/2019/giles/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-cast-align -Wno-comma -Wno-double-promotion -Wno-format-nonliteral \ -Wno-implicit-float-conversion -Wno-missing-prototypes \ @@ -94,7 +94,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2019/karns/Makefile b/2019/karns/Makefile index 5677b3f1d..f8abf9603 100644 --- a/2019/karns/Makefile +++ b/2019/karns/Makefile @@ -84,7 +84,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-conditional-uninitialized -Wno-missing-variable-declarations \ -Wno-poison-system-directories -Wno-shadow -Wno-shorten-64-to-32 \ @@ -96,7 +96,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2019/lynn/Makefile b/2019/lynn/Makefile index ab0a0125e..28c3fd84b 100644 --- a/2019/lynn/Makefile +++ b/2019/lynn/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-missing-prototypes -Wno-missing-variable-declarations \ -Wno-poison-system-directories -Wno-shadow -Wno-sign-conversion @@ -92,7 +92,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2019/mills/Makefile b/2019/mills/Makefile index 0c84fb4b1..f92232eca 100644 --- a/2019/mills/Makefile +++ b/2019/mills/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-double-promotion -Wno-float-conversion -Wno-format-nonliteral \ -Wno-implicit-float-conversion -Wno-implicit-int-conversion \ @@ -96,7 +96,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2019/poikola/Makefile b/2019/poikola/Makefile index 14395bad2..f3b29bb59 100644 --- a/2019/poikola/Makefile +++ b/2019/poikola/Makefile @@ -82,7 +82,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-conditional-uninitialized -Wno-date-time \ -Wno-implicit-int-conversion -Wno-missing-variable-declarations \ @@ -95,7 +95,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2019/yang/Makefile b/2019/yang/Makefile index 91a30fc5d..4ecb7dc7b 100644 --- a/2019/yang/Makefile +++ b/2019/yang/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-missing-prototypes -Wno-missing-variable-declarations \ -Wno-poison-system-directories -Wno-shadow -Wno-sign-conversion \ @@ -93,7 +93,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2020/burton/Makefile b/2020/burton/Makefile index ed9fdab45..a70755b2b 100644 --- a/2020/burton/Makefile +++ b/2020/burton/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-poison-system-directories # @@ -91,7 +91,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2020/carlini/Makefile b/2020/carlini/Makefile index 13b0bcb23..0009543c7 100644 --- a/2020/carlini/Makefile +++ b/2020/carlini/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-format-nonliteral -Wno-missing-variable-declarations \ -Wno-poison-system-directories @@ -92,7 +92,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2020/endoh1/Makefile b/2020/endoh1/Makefile index 04eb7ac6a..34e09f63b 100644 --- a/2020/endoh1/Makefile +++ b/2020/endoh1/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-implicit-int-conversion -Wno-missing-prototypes \ -Wno-missing-variable-declarations -Wno-poison-system-directories \ @@ -94,7 +94,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2020/endoh2/Makefile b/2020/endoh2/Makefile index ade4717ba..eb18470ec 100644 --- a/2020/endoh2/Makefile +++ b/2020/endoh2/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-conversion -Wno-documentation -Wno-double-promotion \ -Wno-missing-prototypes -Wno-missing-variable-declarations \ @@ -94,7 +94,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2020/endoh3/Makefile b/2020/endoh3/Makefile index 2518b228c..ee5c18d77 100644 --- a/2020/endoh3/Makefile +++ b/2020/endoh3/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-date-time -Wno-float-conversion -Wno-implicit-float-conversion \ -Wno-missing-prototypes -Wno-missing-variable-declarations \ @@ -93,7 +93,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2020/ferguson1/Makefile b/2020/ferguson1/Makefile index 33d85d862..12ea0c219 100644 --- a/2020/ferguson1/Makefile +++ b/2020/ferguson1/Makefile @@ -85,7 +85,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE= -Wno-unused-value -Wno-misleading-indentation -Wno-parentheses \ -Wno-unknown-warning-option -Wno-poison-system-directories \ @@ -97,7 +97,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2020/ferguson2/Makefile b/2020/ferguson2/Makefile index abefb0a70..28a0a1e2f 100644 --- a/2020/ferguson2/Makefile +++ b/2020/ferguson2/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-implicit-int-conversion -Wno-missing-prototypes \ -Wno-missing-variable-declarations -Wno-poison-system-directories \ @@ -93,7 +93,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2020/giles/Makefile b/2020/giles/Makefile index 350835cc1..e354c701d 100644 --- a/2020/giles/Makefile +++ b/2020/giles/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-disabled-macro-expansion -Wno-float-conversion -Wno-float-equal \ -Wno-missing-variable-declarations -Wno-poison-system-directories \ @@ -94,7 +94,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2020/kurdyukov1/Makefile b/2020/kurdyukov1/Makefile index a1db9286c..1e2005b32 100644 --- a/2020/kurdyukov1/Makefile +++ b/2020/kurdyukov1/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-poison-system-directories -Wno-shorten-64-to-32 \ -Wno-sign-conversion @@ -92,7 +92,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2020/kurdyukov2/Makefile b/2020/kurdyukov2/Makefile index 3c9397791..a85ee6445 100644 --- a/2020/kurdyukov2/Makefile +++ b/2020/kurdyukov2/Makefile @@ -83,7 +83,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-poison-system-directories -Wno-comma -Wno-implicit-int-conversion \ -Wno-padded -Wno-shadow -Wno-shorten-64-to-32 -Wno-sign-conversion @@ -94,7 +94,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2020/kurdyukov3/Makefile b/2020/kurdyukov3/Makefile index ac4e5abf8..d23989347 100644 --- a/2020/kurdyukov3/Makefile +++ b/2020/kurdyukov3/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-conditional-uninitialized -Wno-poison-system-directories \ -Wno-shorten-64-to-32 -Wno-sign-conversion -Wno-declaration-after-statement @@ -92,7 +92,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2020/kurdyukov4/Makefile b/2020/kurdyukov4/Makefile index 29d6c7e23..154cdc613 100644 --- a/2020/kurdyukov4/Makefile +++ b/2020/kurdyukov4/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-implicit-int-conversion -Wno-poison-system-directories \ -Wno-shorten-64-to-32 -Wno-sign-conversion -Wno-unused-macros @@ -92,7 +92,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2020/otterness/Makefile b/2020/otterness/Makefile index 2d9ca88ca..d707d2cb1 100644 --- a/2020/otterness/Makefile +++ b/2020/otterness/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-implicit-int-conversion -Wno-missing-prototypes \ -Wno-missing-variable-declarations -Wno-poison-system-directories \ @@ -93,7 +93,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2020/tsoj/Makefile b/2020/tsoj/Makefile index 746060749..c6fdbc457 100644 --- a/2020/tsoj/Makefile +++ b/2020/tsoj/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-float-conversion -Wno-implicit-float-conversion \ -Wno-missing-prototypes -Wno-poison-system-directories -Wno-shadow \ @@ -94,7 +94,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/2020/yang/Makefile b/2020/yang/Makefile index c2177c6ae..e3bfcd8d2 100644 --- a/2020/yang/Makefile +++ b/2020/yang/Makefile @@ -81,7 +81,7 @@ CC= cc # Compiler add-ons or replacements for clang only # -ifeq ($(CC),clang) +ifeq "$(findstring $(CLANG),${CC})" "$(CLANG)" # CSILENCE+= -Wno-comma -Wno-format-nonliteral -Wno-implicit-int-conversion \ -Wno-missing-prototypes -Wno-missing-variable-declarations \ @@ -94,7 +94,7 @@ endif # Specific add-ons or replacements for gcc only # -ifeq ($(CC),gcc) +ifeq "$(findstring $(GCC),${CC})" "$(GCC)" # #CSILENCE+= # diff --git a/faq.md b/faq.md index a4c4177e3..53ac0dc2e 100644 --- a/faq.md +++ b/faq.md @@ -883,11 +883,14 @@ While we know that use of `-Weverything` is generally not recommended by `clang` C compiler developers, we do use the `-Weverything` option in a certain case in IOCCC winner `Makefile`s. -The use of `-Weverything` is limited to when one forces `CC=clang`. Users with -clang compilers are not required to set `CC=clang` but when they do, -`-Weverything` is enabled with all of its challenges, pedantic warnings, and -sometimes warnings about things that do not matter, some of which are frankly -frivolous and often downright dubious. +The use of `-Weverything` is limited to when one forces `CC=clang` or more +generally if the string 'clang' is in `$(CC)`. If `$(CC)` contains 'gcc' the +'gcc' specific options are run instead. + +Users with clang compilers are not required to set `CC=clang` or equivalent but +when they do, `-Weverything` is enabled with all of its challenges, pedantic +warnings, and sometimes warnings about things that do not matter, some of which +are frankly frivolous and often downright dubious. To enable this feature: