Skip to content

Commit d4331a4

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 <johannes.schindelin@gmx.de>
1 parent b604a88 commit d4331a4

1 file changed

Lines changed: 4 additions & 6 deletions

File tree

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
@@ -753,6 +753,9 @@ ifeq ($(uname_S),MINGW)
753753
ifeq (MINGW32,$(MSYSTEM))
754754
BASIC_LDFLAGS += -Wl,--large-address-aware
755755
endif
756+
# Move system config into top-level /etc/
757+
ETC_GITCONFIG = ../etc/gitconfig
758+
ETC_GITATTRIBUTES = ../etc/gitattributes
756759
endif
757760
CC = gcc
758761
COMPAT_CFLAGS += -D__USE_MINGW_ANSI_STDIO=0 -fstack-protector-strong
@@ -765,11 +768,6 @@ ifeq ($(uname_S),MINGW)
765768
USE_LIBPCRE = YesPlease
766769
USE_MIMALLOC = YesPlease
767770
NO_PYTHON =
768-
ifeq (/mingw64,$(subst 32,64,$(subst clangarm,mingw,$(prefix))))
769-
# Move system config into top-level /etc/
770-
ETC_GITCONFIG = ../etc/gitconfig
771-
ETC_GITATTRIBUTES = ../etc/gitattributes
772-
endif
773771
endif
774772
ifeq ($(uname_S),QNX)
775773
COMPAT_CFLAGS += -DSA_RESTART=0

0 commit comments

Comments
 (0)