diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-03-11 07:16:34 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-03-11 07:16:34 (GMT) |
| commit | be9f1c02241c31ff170aba6dc66079e511490d23 (patch) | |
| tree | 1b461ca3a2edec1b18efc63705a163ccae00dc89 | |
| parent | a07baf33e37ddeb82778e572aea2d506d970b5ab (diff) | |
| parent | aeb582a98374c094361cba1bd756dc6307432c42 (diff) | |
| download | git-be9f1c02241c31ff170aba6dc66079e511490d23.zip git-be9f1c02241c31ff170aba6dc66079e511490d23.tar.gz git-be9f1c02241c31ff170aba6dc66079e511490d23.tar.bz2 | |
Sync with maint
* maint:
mingw: allow building with an MSYS2 runtime v3.x
| -rw-r--r-- | config.mak.uname | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config.mak.uname b/config.mak.uname index dcf8bd7..41e85fa 100644 --- 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)) |