From: Bram Moolenaar <Bram@vim.org>
Date: Thu, 14 Jul 2016 18:25:03 +0000 (+0200)
Subject: patch 7.4.2034
X-Git-Tag: v7.4.2034
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f62e797ffa6ab5d4c476b4c9e9a1f7f852910652;p=vim

patch 7.4.2034
Problem:    Build fails with some version of MinGW. (illusorypan)
Solution:   Recognize mingw32. (Ken Takata, closes #921)
---

diff --git a/src/Make_cyg_ming.mak b/src/Make_cyg_ming.mak
index 0e21256ec..73db7fea1 100644
--- a/src/Make_cyg_ming.mak
+++ b/src/Make_cyg_ming.mak
@@ -149,7 +149,7 @@ WINDRES_CC = $(CC)
 
 # Get the default ARCH.
 ifndef ARCH
-ARCH := $(shell $(CC) -dumpmachine | sed -e 's/-.*//' -e 's/_/-/')
+ARCH := $(shell $(CC) -dumpmachine | sed -e 's/-.*//' -e 's/_/-/' -e 's/^mingw32$$/i686/')
 endif
 
 
diff --git a/src/version.c b/src/version.c
index 6dbbeb9ce..af29306e1 100644
--- a/src/version.c
+++ b/src/version.c
@@ -758,6 +758,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2034,
 /**/
     2033,
 /**/