@@ -493,7 +493,7 @@ ifeq ($(uname_S),Windows)
493493 NATIVE_CRLF = YesPlease
494494 DEFAULT_HELP_FORMAT = html
495495 SKIP_DASHED_BUILT_INS = YabbaDabbaDoo
496- ifeq (/mingw64 ,$(subst 32,64,$(subst clangarm,mingw,$(prefix)) ))
496+ ifneq ( ,$(MINGW_PREFIX ))
497497 # Move system config into top-level /etc/
498498 ETC_GITCONFIG = ../etc/gitconfig
499499 ETC_GITATTRIBUTES = ../etc/gitattributes
@@ -743,6 +743,9 @@ ifeq ($(uname_S),MINGW)
743743 ifeq (MINGW32,$(MSYSTEM))
744744 BASIC_LDFLAGS += -Wl,--large-address-aware
745745 endif
746+ # Move system config into top-level /etc/
747+ ETC_GITCONFIG = ../etc/gitconfig
748+ ETC_GITATTRIBUTES = ../etc/gitattributes
746749 endif
747750 COMPAT_CFLAGS += -D__USE_MINGW_ANSI_STDIO=0 -fstack-protector-strong
748751 EXTLIBS += -lntdll
@@ -754,11 +757,6 @@ ifeq ($(uname_S),MINGW)
754757 USE_LIBPCRE = YesPlease
755758 USE_MIMALLOC = YesPlease
756759 NO_PYTHON =
757- ifeq (/mingw64,$(subst 32,64,$(subst clangarm,mingw,$(prefix))))
758- # Move system config into top-level /etc/
759- ETC_GITCONFIG = ../etc/gitconfig
760- ETC_GITATTRIBUTES = ../etc/gitattributes
761- endif
762760endif
763761ifeq ($(uname_S),QNX)
764762 COMPAT_CFLAGS += -DSA_RESTART=0
0 commit comments