Andrew's git / gitweb.git / diff
?
Sync with maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 11 Mar 2019 07:16:34 +0000 (16:16 +0900)
committerJunio C Hamano <gitster@pobox.com>
Mon, 11 Mar 2019 07:16:34 +0000 (16:16 +0900)
* maint:
mingw: allow building with an MSYS2 runtime v3.x

config.mak.uname patch | blob | history
diff --git a/config.mak.uname b/config.mak.uname
index dcf8bd7c75e2cd144e3b16494ca480dae0dfe315..41e85fab1c8d1ed5b6b7ffdbe8b840bdc12d77de 100644 (file)
--- a/config.mak.uname
+++ b/config.mak.uname
@@ -568,7 +568,7 @@ ifneq (,$(wildcard ../THIS_IS_MSYSGIT))
        NO_GETTEXT = YesPlease
        COMPAT_CLFAGS += -D__USE_MINGW_ACCESS
 else
-       ifeq ($(shell expr "$(uname_R)" : '2\.'),2)
+       ifneq ($(shell expr "$(uname_R)" : '1\.'),2)
                # MSys2
                prefix = /usr/
                ifeq (MINGW32,$(MSYSTEM))