Skip to content

Commit 8f62334

Browse files
committed
Some clangarm64 fixes (#5439)
Most notably, this fixes #5431, i.e. that the ARM64 flavor of Git for Windows does not use `/etc/gitconfig` by mistake, but `/clangarm64/etc/gitconfig` instead. My original intention was to fix only that issue, but when I fired up a Git for Windows/ARM64 SDK and tried to build, I immediately ran into trouble, then noticed places where ARM64 was not yet handled, and one thing led to another and now it's a 6-patch PR instead of a single-patch one.
2 parents 5e5857f + fd534de commit 8f62334

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

config.mak.uname

+7-3
Original file line numberDiff line numberDiff line change
@@ -432,7 +432,11 @@ ifeq ($(uname_S),Windows)
432432
ifeq (MINGW32,$(MSYSTEM))
433433
prefix = /mingw32
434434
else
435-
prefix = /mingw64
435+
ifeq (CLANGARM64,$(MSYSTEM))
436+
prefix = /clangarm64
437+
else
438+
prefix = /mingw64
439+
endif
436440
endif
437441
# Prepend MSVC 64-bit tool-chain to PATH.
438442
#
@@ -486,7 +490,7 @@ ifeq ($(uname_S),Windows)
486490
NATIVE_CRLF = YesPlease
487491
DEFAULT_HELP_FORMAT = html
488492
SKIP_DASHED_BUILT_INS = YabbaDabbaDoo
489-
ifeq (/mingw64,$(subst 32,64,$(prefix)))
493+
ifeq (/mingw64,$(subst 32,64,$(subst clangarm,mingw,$(prefix))))
490494
# Move system config into top-level /etc/
491495
ETC_GITCONFIG = ../etc/gitconfig
492496
ETC_GITATTRIBUTES = ../etc/gitattributes
@@ -748,7 +752,7 @@ ifeq ($(uname_S),MINGW)
748752
USE_LIBPCRE = YesPlease
749753
USE_MIMALLOC = YesPlease
750754
NO_PYTHON =
751-
ifeq (/mingw64,$(subst 32,64,$(prefix)))
755+
ifeq (/mingw64,$(subst 32,64,$(subst clangarm,mingw,$(prefix))))
752756
# Move system config into top-level /etc/
753757
ETC_GITCONFIG = ../etc/gitconfig
754758
ETC_GITATTRIBUTES = ../etc/gitattributes

0 commit comments

Comments
 (0)