Merge pull request #2115 from dscho/gfw/msys2-3.x

mingw: allow building with an MSYS2 runtime v3.x
This commit is contained in:
Johannes Schindelin
2019-03-10 17:37:25 +01:00
committed by GitHub

View File

@@ -626,7 +626,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/
# Enable DEP