Skip to content

Commit 9abcf48

Browse files
committed
mingw: always define ETC_* for MSYS2 environments
Special-casing even more configurations simply does not make sense. Signed-off-by: Johannes Schindelin <[email protected]>
1 parent eea27f5 commit 9abcf48

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

config.mak.uname

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -507,7 +507,7 @@ ifeq ($(uname_S),Windows)
507507
NATIVE_CRLF = YesPlease
508508
DEFAULT_HELP_FORMAT = html
509509
SKIP_DASHED_BUILT_INS = YabbaDabbaDoo
510-
ifeq (/mingw64,$(subst 32,64,$(subst clangarm,mingw,$(prefix))))
510+
ifneq (,$(MINGW_PREFIX))
511511
# Move system config into top-level /etc/
512512
ETC_GITCONFIG = ../etc/gitconfig
513513
ETC_GITATTRIBUTES = ../etc/gitattributes
@@ -757,6 +757,9 @@ ifeq ($(uname_S),MINGW)
757757
ifeq (MINGW32,$(MSYSTEM))
758758
BASIC_LDFLAGS += -Wl,--large-address-aware
759759
endif
760+
# Move system config into top-level /etc/
761+
ETC_GITCONFIG = ../etc/gitconfig
762+
ETC_GITATTRIBUTES = ../etc/gitattributes
760763
endif
761764
COMPAT_CFLAGS += -D__USE_MINGW_ANSI_STDIO=0 -fstack-protector-strong
762765
EXTLIBS += -lntdll
@@ -768,11 +771,6 @@ ifeq ($(uname_S),MINGW)
768771
USE_LIBPCRE = YesPlease
769772
USE_MIMALLOC = YesPlease
770773
NO_PYTHON =
771-
ifeq (/mingw64,$(subst 32,64,$(subst clangarm,mingw,$(prefix))))
772-
# Move system config into top-level /etc/
773-
ETC_GITCONFIG = ../etc/gitconfig
774-
ETC_GITATTRIBUTES = ../etc/gitattributes
775-
endif
776774
endif
777775
ifeq ($(uname_S),QNX)
778776
COMPAT_CFLAGS += -DSA_RESTART=0

0 commit comments

Comments
 (0)