Skip to content

Commit aeb582a

Browse files
dschogitster
authored andcommitted
mingw: allow building with an MSYS2 runtime v3.x
Recently the Git for Windows project started the upgrade process to a MSYS2 runtime version based on Cygwin v3.x. This has the very notable consequence that `$(uname -r)` no longer reports a version starting with "2", but a version with "3". That breaks our build, as df5218b (config.mak.uname: support MSys2, 2016-01-13) simply did not expect the version reported by `uname -r` to depend on the underlying Cygwin version: it expected the reported version to match the "2" in "MSYS2". So let's invert that test case to test for *anything else* than a version starting with "1" (for MSys). That should safeguard us for the future, even if Cygwin ends up releasing versionsl like 314.272.65536. Signed-off-by: Johannes Schindelin <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 36eb1cb commit aeb582a

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

config.mak.uname

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -567,7 +567,7 @@ ifneq (,$(wildcard ../THIS_IS_MSYSGIT))
567567
NO_GETTEXT = YesPlease
568568
COMPAT_CLFAGS += -D__USE_MINGW_ACCESS
569569
else
570-
ifeq ($(shell expr "$(uname_R)" : '2\.'),2)
570+
ifneq ($(shell expr "$(uname_R)" : '1\.'),2)
571571
# MSys2
572572
prefix = /usr/
573573
ifeq (MINGW32,$(MSYSTEM))

0 commit comments

Comments
 (0)