summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schindelin <johannes.schindelin@gmx.de>2019-03-08 15:51:19 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-03-11 02:02:16 (GMT)
commitaeb582a98374c094361cba1bd756dc6307432c42 (patch)
treef88bf68d3b30756f68aa1c8ab950e44539958d2b
parent36eb1cb9cfe327583128a4b0abdf9516c2ca815b (diff)
downloadgit-aeb582a98374c094361cba1bd756dc6307432c42.zip
git-aeb582a98374c094361cba1bd756dc6307432c42.tar.gz
git-aeb582a98374c094361cba1bd756dc6307432c42.tar.bz2
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 df5218b4c30b (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 <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--config.mak.uname2
1 files changed, 1 insertions, 1 deletions
diff --git a/config.mak.uname b/config.mak.uname
index b37fa84..2011bac 100644
--- a/config.mak.uname
+++ b/config.mak.uname
@@ -567,7 +567,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))