From 412256ec361529ab34245d947d26c7c99826472f Mon Sep 17 00:00:00 2001 From: avi Date: Tue, 28 Oct 2025 13:38:35 +1300 Subject: [PATCH 1/5] fix: add extra flags based on clang and some additional flags --- src/Makefile | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/src/Makefile b/src/Makefile index 7703335fa..65dd3f6c8 100644 --- a/src/Makefile +++ b/src/Makefile @@ -90,7 +90,27 @@ ifneq ($(filter fast staticfast,$(MAKECMDGOALS)),) OPTFLAGS += $(OPTFLAGS_SPECIFIC) endif -CXXFLAGS := -std=c++17 -Wall $(OPTFLAGS) $(CXXFLAGS_SPECIFIC) + +### Suppress specific warnings for clang +COMPILER_NAME := $(shell $(CPP) --version | head -n 1) +ifeq ($(findstring clang,$(COMPILER_NAME)),clang) + CLANG_VERSION_MAJOR := $(shell $(CPP) -dumpversion | cut -d. -f1) + ifneq (,$(filter $(CLANG_VERSION_MAJOR),17 18 19 20)) + CLANG_VLA_FLAG := -Wno-vla-cxx-extension + else + CLANG_VLA_FLAG := -Wno-vla-extension + endif +endif + +EXTRA_WARN_SUPPRESS := \ + -Wno-unused-parameter \ + -Wno-unused-variable \ + -Wno-sign-compare \ + -Wno-reorder-ctor \ + -Wno-unused-function + + +CXXFLAGS := -std=c++17 -Wall $(OPTFLAGS) $(CXXFLAGS_SPECIFIC) $(CLANG_VLA_FLAG) $(EXTRA_WARN_SUPPRESS) ICFLAGS := -I$(GSLINCDIR) -I$(BOOSTINCDIR) -I$(HDF5INCDIR) -I. LIBS := -lm -lz -ldl -lpthread From 417c8c84eedd9a781cbe9eb71441f697653c9745 Mon Sep 17 00:00:00 2001 From: avi Date: Tue, 28 Oct 2025 14:16:41 +1300 Subject: [PATCH 2/5] forget about differnt clang versions -- lets just assume we need only Wno-vla-extension --- src/Makefile | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/src/Makefile b/src/Makefile index 65dd3f6c8..b365e9b28 100644 --- a/src/Makefile +++ b/src/Makefile @@ -91,18 +91,8 @@ ifneq ($(filter fast staticfast,$(MAKECMDGOALS)),) endif -### Suppress specific warnings for clang -COMPILER_NAME := $(shell $(CPP) --version | head -n 1) -ifeq ($(findstring clang,$(COMPILER_NAME)),clang) - CLANG_VERSION_MAJOR := $(shell $(CPP) -dumpversion | cut -d. -f1) - ifneq (,$(filter $(CLANG_VERSION_MAJOR),17 18 19 20)) - CLANG_VLA_FLAG := -Wno-vla-cxx-extension - else - CLANG_VLA_FLAG := -Wno-vla-extension - endif -endif - EXTRA_WARN_SUPPRESS := \ + -Wno-vla-extension \ # might need -Wno-vla-cxx-extension for clang>18? -Wno-unused-parameter \ -Wno-unused-variable \ -Wno-sign-compare \ @@ -110,7 +100,7 @@ EXTRA_WARN_SUPPRESS := \ -Wno-unused-function -CXXFLAGS := -std=c++17 -Wall $(OPTFLAGS) $(CXXFLAGS_SPECIFIC) $(CLANG_VLA_FLAG) $(EXTRA_WARN_SUPPRESS) +CXXFLAGS := -std=c++17 -Wall $(OPTFLAGS) $(CXXFLAGS_SPECIFIC) $(EXTRA_WARN_SUPPRESS) ICFLAGS := -I$(GSLINCDIR) -I$(BOOSTINCDIR) -I$(HDF5INCDIR) -I. LIBS := -lm -lz -ldl -lpthread From d95ea708586e83893131b932026db78726440ec0 Mon Sep 17 00:00:00 2001 From: avi Date: Tue, 28 Oct 2025 14:22:20 +1300 Subject: [PATCH 3/5] forget about differnt clang versions -- lets just assume we need only Wno-vla-extension --- src/Makefile | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/src/Makefile b/src/Makefile index b365e9b28..3bebd39de 100644 --- a/src/Makefile +++ b/src/Makefile @@ -90,15 +90,8 @@ ifneq ($(filter fast staticfast,$(MAKECMDGOALS)),) OPTFLAGS += $(OPTFLAGS_SPECIFIC) endif - -EXTRA_WARN_SUPPRESS := \ - -Wno-vla-extension \ # might need -Wno-vla-cxx-extension for clang>18? - -Wno-unused-parameter \ - -Wno-unused-variable \ - -Wno-sign-compare \ - -Wno-reorder-ctor \ - -Wno-unused-function - +# might need -Wno-vla-cxx-extension for clang>18? +EXTRA_WARN_SUPPRESS := -Wno-vla-extension #-Wno-unused-parameter -Wno-unused-variable -Wno-sign-compare -Wno-reorder-ctor -Wno-unused-function CXXFLAGS := -std=c++17 -Wall $(OPTFLAGS) $(CXXFLAGS_SPECIFIC) $(EXTRA_WARN_SUPPRESS) ICFLAGS := -I$(GSLINCDIR) -I$(BOOSTINCDIR) -I$(HDF5INCDIR) -I. From 8cdd1143f194d7b7784bb651c8f154612fb49310 Mon Sep 17 00:00:00 2001 From: avi Date: Tue, 28 Oct 2025 14:24:52 +1300 Subject: [PATCH 4/5] remove comment --- src/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Makefile b/src/Makefile index 3bebd39de..aea296e6b 100644 --- a/src/Makefile +++ b/src/Makefile @@ -91,7 +91,7 @@ ifneq ($(filter fast staticfast,$(MAKECMDGOALS)),) endif # might need -Wno-vla-cxx-extension for clang>18? -EXTRA_WARN_SUPPRESS := -Wno-vla-extension #-Wno-unused-parameter -Wno-unused-variable -Wno-sign-compare -Wno-reorder-ctor -Wno-unused-function +EXTRA_WARN_SUPPRESS := -Wno-vla-extension -Wno-unused-parameter -Wno-unused-variable -Wno-sign-compare -Wno-reorder-ctor -Wno-unused-function CXXFLAGS := -std=c++17 -Wall $(OPTFLAGS) $(CXXFLAGS_SPECIFIC) $(EXTRA_WARN_SUPPRESS) ICFLAGS := -I$(GSLINCDIR) -I$(BOOSTINCDIR) -I$(HDF5INCDIR) -I. From 88d4832a3b27d44aa93155cb5fbf23399abd4740 Mon Sep 17 00:00:00 2001 From: Avi Vajpeyi Date: Tue, 28 Oct 2025 15:01:58 +1300 Subject: [PATCH 5/5] Simplify warning suppressions in Makefile Removed unnecessary warning suppressions from EXTRA_WARN_SUPPRESS. --- src/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Makefile b/src/Makefile index aea296e6b..631c17df6 100644 --- a/src/Makefile +++ b/src/Makefile @@ -91,7 +91,7 @@ ifneq ($(filter fast staticfast,$(MAKECMDGOALS)),) endif # might need -Wno-vla-cxx-extension for clang>18? -EXTRA_WARN_SUPPRESS := -Wno-vla-extension -Wno-unused-parameter -Wno-unused-variable -Wno-sign-compare -Wno-reorder-ctor -Wno-unused-function +EXTRA_WARN_SUPPRESS := -Wno-vla-extension CXXFLAGS := -std=c++17 -Wall $(OPTFLAGS) $(CXXFLAGS_SPECIFIC) $(EXTRA_WARN_SUPPRESS) ICFLAGS := -I$(GSLINCDIR) -I$(BOOSTINCDIR) -I$(HDF5INCDIR) -I. @@ -133,4 +133,4 @@ $(ODIR)/%.o: %.cpp # Clean-up rule clean: @echo "Removing generated files..." - @rm -rf $(ODIR) $(BDIR) COMPAS \ No newline at end of file + @rm -rf $(ODIR) $(BDIR) COMPAS