Subject: Re: [PATCH 1/3] Makefile: restrict -Wpedantic and -Wno-pedantic-ms-format better

From: Junio C Hamano <[email-masked]>
Date: Tue, 28 Sep 2021 16:39:10 -0700

Ævar Arnfjörð Bjarmason <[email-masked]> writes:

> In any case, I wonder if we should at least be better off with the
> diff-at-the-end on top (untested).
> ...
> --- a/config.mak.uname
> +++ b/config.mak.uname
> @@ -11,6 +11,10 @@ uname_R := $(shell sh -c 'uname -r 2>/dev/null || echo not')
>  uname_P := $(shell sh -c 'uname -p 2>/dev/null || echo not')
>  uname_V := $(shell sh -c 'uname -v 2>/dev/null || echo not')
>  
> +ifneq (,$(findstring MINGW,$(uname_S)))
> +	uname_S := MINGW
> +endif
> +

It does sound like a better organization to "normalize" different
spellings early so that later users of the macro can pretend that
there is no "MINGW64_BLA-foo" to worry about.

>  ifdef MSVC
>  	# avoid the MingW and Cygwin configuration sections
>  	uname_S := Windows
> @@ -588,8 +592,7 @@ ifeq ($(uname_S),NONSTOP_KERNEL)
>  	SANE_TOOL_PATH = /usr/coreutils/bin:/usr/local/bin
>  	SHELL_PATH = /usr/coreutils/bin/bash
>  endif
> -ifneq (,$(findstring MINGW,$(uname_S)))
> -	uname_S := MINGW
> +ifeq ($(uname_S),MINGW)
>  	pathsep = ;
>  	HAVE_ALLOCA_H = YesPlease
>  	NO_PREAD = YesPlease

Thanks.