"Johannes Schindelin via GitGitGadget" <gitgitgadget@xxxxxxxxx>
writes:
> - USE_NED_ALLOCATOR = YesPlease
> + ifneq (CLANGARM64,$(MSYSTEM))
> + USE_NED_ALLOCATOR = YesPlease
> + endif
> ifeq (/mingw64,$(subst 32,64,$(prefix)))
Notice the funny indentation above? It turns out that the one in
the context that looks funnily indented uses the "correct"
indentation, which is quite counter-intuitive and confusing X-<.
I forgot about the rule while reviewing the previous round, but we
had to prepare for newer GNU make with commits like c18400c6
(Makefile(s): avoid recipe prefix in conditional statements,
2024-04-08). In short, the conditionals like ifn?eq, ifn?def, else,
endif should not be indented with HT and we instead want them to be
indented with SP.
$ git diff master... config.mak.uname |
grep -E -e '^[+] +(ifn?eq|ifn?def|else|endif)'
found them in a few patches in the series that touch
config.mak.uname
msvc: do handle builds on Windows/ARM64
mingw: do not use nedmalloc on Windows/ARM64
Fix-up for "mingw: do not use nedmalloc on Windows/ARM64"
config.mak.uname | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git c/config.mak.uname w/config.mak.uname
index 6222d2c5a4..3ec82d95e6 100644
--- c/config.mak.uname
+++ w/config.mak.uname
@@ -742,9 +742,9 @@ ifeq ($(uname_S),MINGW)
HAVE_LIBCHARSET_H = YesPlease
USE_GETTEXT_SCHEME = fallthrough
USE_LIBPCRE = YesPlease
- ifneq (CLANGARM64,$(MSYSTEM))
+ ifneq (CLANGARM64,$(MSYSTEM))
USE_NED_ALLOCATOR = YesPlease
- endif
+ endif
ifeq (/mingw64,$(subst 32,64,$(prefix)))
# Move system config into top-level /etc/
ETC_GITCONFIG = ../etc/gitconfig
Fix-up for "msvc: do handle builds on Windows/ARM64"
config.mak.uname | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git c/config.mak.uname w/config.mak.uname
index 4831e9ccf6..4ef453ebcd 100644
--- c/config.mak.uname
+++ w/config.mak.uname
@@ -432,11 +432,11 @@ ifeq ($(uname_S),Windows)
ifeq (MINGW32,$(MSYSTEM))
prefix = /mingw32
else
- ifeq (CLANGARM64,$(MSYSTEM))
+ ifeq (CLANGARM64,$(MSYSTEM))
prefix = /clangarm64
- else
+ else
prefix = /mingw64
- endif
+ endif
endif
# Prepend MSVC 64-bit tool-chain to PATH.
#
Taken as a whole, here is a range-diff of what I will queue based on
this iteration.
Thanks.
1: da1408a34e ! 1: 734bf24007 mingw: do not use nedmalloc on Windows/ARM64
@@ Commit message
there is also no hope that any fixes will materialize there.
Signed-off-by: Johannes Schindelin <johannes.schindelin@xxxxxx>
+ [jc: adjust config.mak.uname for c18400c6]
Signed-off-by: Junio C Hamano <gitster@xxxxxxxxx>
## config.mak.uname ##
@@ config.mak.uname: ifeq ($(uname_S),MINGW)
USE_GETTEXT_SCHEME = fallthrough
USE_LIBPCRE = YesPlease
- USE_NED_ALLOCATOR = YesPlease
-+ ifneq (CLANGARM64,$(MSYSTEM))
++ ifneq (CLANGARM64,$(MSYSTEM))
+ USE_NED_ALLOCATOR = YesPlease
-+ endif
++ endif
ifeq (/mingw64,$(subst 32,64,$(prefix)))
# Move system config into top-level /etc/
ETC_GITCONFIG = ../etc/gitconfig
2: e27caa3dca ! 2: 8945fba590 msvc: do handle builds on Windows/ARM64
@@ Commit message
is time to do the same in the MS Visual C part.
Signed-off-by: Johannes Schindelin <johannes.schindelin@xxxxxx>
+ [jc: adjust config.mak.uname for c18400c6]
Signed-off-by: Junio C Hamano <gitster@xxxxxxxxx>
## config.mak.uname ##
@@ config.mak.uname: ifeq ($(uname_S),Windows)
prefix = /mingw32
else
- prefix = /mingw64
-+ ifeq (CLANGARM64,$(MSYSTEM))
++ ifeq (CLANGARM64,$(MSYSTEM))
+ prefix = /clangarm64
-+ else
++ else
+ prefix = /mingw64
-+ endif
++ endif
endif
# Prepend MSVC 64-bit tool-chain to PATH.
#
3: f1f6c1f2fa ! 3: 619950d421 mingw(arm64): do move the `/etc/git*` location
@@ config.mak.uname: ifeq ($(uname_S),Windows)
ETC_GITCONFIG = ../etc/gitconfig
ETC_GITATTRIBUTES = ../etc/gitattributes
@@ config.mak.uname: ifeq ($(uname_S),MINGW)
- ifneq (CLANGARM64,$(MSYSTEM))
+ ifneq (CLANGARM64,$(MSYSTEM))
USE_NED_ALLOCATOR = YesPlease
- endif
+ endif
- ifeq (/mingw64,$(subst 32,64,$(prefix)))
+ ifeq (/mingw64,$(subst 32,64,$(subst clangarm,mingw,$(prefix))))
# Move system config into top-level /etc/
4: 687bd4ea96 = 4: 436a42215e max_tree_depth: lower it for clangarm64 on Windows
