Skip to content

Commit 939bcb0

Browse files
committed
mingw(arm64): do move the /etc/git* location
In fb5e337 (mingw: move Git for Windows' system config where users expect it, 2021-06-22), I moved the location of Git for Windows' system config and system Git attributes file to the top-level `/etc/` directory (because it is a much more obvious location than, say, `/mingw64/etc/`). The patch relied on a very specific scenario that the newly-supported Windows/ARM64 builds of `git.exe` fails to fall into. So let's broaden the condition a bit, so that Windows/ARM64 builds also use that location (instead of the even more obscure `/clangarm64/etc/` directory). This fixes git-for-windows#5431. Signed-off-by: Johannes Schindelin <[email protected]>
1 parent c89ead8 commit 939bcb0

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

config.mak.uname

+2-2
Original file line numberDiff line numberDiff line change
@@ -489,7 +489,7 @@ ifeq ($(uname_S),Windows)
489489
NO_POSIX_GOODIES = UnfortunatelyYes
490490
NATIVE_CRLF = YesPlease
491491
DEFAULT_HELP_FORMAT = html
492-
ifeq (/mingw64,$(subst 32,64,$(prefix)))
492+
ifeq (/mingw64,$(subst 32,64,$(subst clangarm,mingw,$(prefix))))
493493
# Move system config into top-level /etc/
494494
ETC_GITCONFIG = ../etc/gitconfig
495495
ETC_GITATTRIBUTES = ../etc/gitattributes
@@ -749,7 +749,7 @@ ifeq ($(uname_S),MINGW)
749749
ifneq (CLANGARM64,$(MSYSTEM))
750750
USE_NED_ALLOCATOR = YesPlease
751751
endif
752-
ifeq (/mingw64,$(subst 32,64,$(prefix)))
752+
ifeq (/mingw64,$(subst 32,64,$(subst clangarm,mingw,$(prefix))))
753753
# Move system config into top-level /etc/
754754
ETC_GITCONFIG = ../etc/gitconfig
755755
ETC_GITATTRIBUTES = ../etc/gitattributes

0 commit comments

Comments
 (0)