[PATCH 1/3] Makefile: restrict -Wpedantic and -Wno-pedantic-ms-format better
- From
Carlo Marcelo Arenas Belón <carenas@gmail.com>
- Date
- Sep 28, 2021, 09:10 UTC
- Message-ID
- <20210928091054.78895-2-carenas@gmail.com>
- In-Reply-To
- <20210928091054.78895-1-carenas@gmail.com>
6a8cbc41ba (developer: enable pedantic by default, 2021-09-03) enables pedantic mode in as many compilers as possible to help gather feedback on future tightening of the net, so lets do so.
-Wpedantic is missing in some really old gcc 4 versions so lets restrict it to gcc5 and clang4 (it does work in clang3 AFAIK, but it will be unlikely a developer will use such an old compiler anyway).
MinGW gcc is the only one which has -Wno-pedantic-ms-format, and while that is available also in older compilers, the Windows SDK provides gcc10 so lets aim for that. Note that in order to target the flag to only Windows, additional changes were needed in config.mak.uname to propagate the OS detection done there.
Signed-off-by: Carlo Marcelo Arenas Belón <carenas@gmail.com> --- config.mak.dev | 6 +++++- config.mak.uname | 3 +++ 2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/config.mak.dev b/config.mak.dev index cdf043c52b..c81be62a5c 100644 --- a/config.mak.dev +++ b/config.mak.dev @@ -9,11 +9,15 @@ endif DEVELOPER_CFLAGS += -Wall ifeq ($(filter no-pedantic,$(DEVOPTS)),) DEVELOPER_CFLAGS += -pedantic +ifneq ($(filter clang4 gcc5,$(COMPILER_FEATURES)),) DEVELOPER_CFLAGS += -Wpedantic -ifneq ($(filter gcc5,$(COMPILER_FEATURES)),) +ifneq ($(filter gcc10,$(COMPILER_FEATURES)),) +ifeq ($(uname_S),MINGW) DEVELOPER_CFLAGS += -Wno-pedantic-ms-format endif endif +endif +endif DEVELOPER_CFLAGS += -Wdeclaration-after-statement DEVELOPER_CFLAGS += -Wformat-security DEVELOPER_CFLAGS += -Wold-style-definition diff --git a/config.mak.uname b/config.mak.uname index 76516aaa9a..aa68bbdec7 100644 --- a/config.mak.uname +++ b/config.mak.uname @@ -589,6 +589,7 @@ ifeq ($(uname_S),NONSTOP_KERNEL) SHELL_PATH = /usr/coreutils/bin/bash endif ifneq (,$(findstring MINGW,$(uname_S))) + uname_S := MINGW pathsep = ; HAVE_ALLOCA_H = YesPlease NO_PREAD = YesPlease @@ -705,6 +706,8 @@ ifeq ($(uname_S),QNX) NO_STRLCPY = YesPlease endif +export uname_S + vcxproj: # Require clean work tree git update-index -q --refresh && \
-- 2.33.0.955.gee03ddbf0e