From 495c34dd401b54cc2ee3aef2e55ec98802a1dccb Mon Sep 17 00:00:00 2001 From: Alug Date: Sat, 27 Dec 2025 13:02:21 +0100 Subject: [PATCH] fix gcc version detection fallback stuff latest_gcc_version should always just be X.x not X.x.x this broke some warning flags for me --- src/Makefile.d/detect.mk | 4 ++-- src/Makefile.d/versions.mk | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/Makefile.d/detect.mk b/src/Makefile.d/detect.mk index dd31d2f3e..7ff978397 100644 --- a/src/Makefile.d/detect.mk +++ b/src/Makefile.d/detect.mk @@ -64,7 +64,7 @@ endif # This must have high to low order. gcc_versions:=\ - 151 150 15\ + 152 151 150 15\ 142 141 140 14\ 132 131 130 13\ 123 122 121 120 12\ @@ -77,7 +77,7 @@ gcc_versions:=\ 55 54 53 52 51 50\ 49 48 47 46 45 44 43 42 41 40 -latest_gcc_version:=15.1.1 +latest_gcc_version:=15.2 # Automatically set version flag, but not if one was # manually set. And don't bother if this is a clean only diff --git a/src/Makefile.d/versions.mk b/src/Makefile.d/versions.mk index 149fb30fc..2a80cfa39 100644 --- a/src/Makefile.d/versions.mk +++ b/src/Makefile.d/versions.mk @@ -20,7 +20,7 @@ $(foreach v,$(join $(wordlist 2,$(_n),- $(gcc_versions)),\ CXXFLAGS+= -Wno-aggregate-return # -W -Wno-unused -WFLAGS:=-Wall -Wno-trigraphs -Wshadow -Wnull-dereference +WFLAGS:=-Wall -Wno-trigraphs -Wnull-dereference ifndef GCC295 #WFLAGS+=-Wno-packed endif @@ -37,6 +37,9 @@ WFLAGS+=-Wfloat-equal ifndef GCC295 WFLAGS+=-Wendif-labels endif +ifdef GCC41 + WFLAGS+=-Wshadow +endif #WFLAGS+=-Wlarger-than-%len% WFLAGS+=-Wpointer-arith CWFLAGS+=-Wbad-function-cast