commit f62e797ffa6ab5d4c476b4c9e9a1f7f852910652
author Bram Moolenaar <Bram@vim.org> Thu Jul 14 20:25:03 2016 +0200
committer Bram Moolenaar <Bram@vim.org> Thu Jul 14 20:25:03 2016 +0200
tree 0acabe5f6f95219470d1e58b30e66add737a0fae
parent 6d20e1754461b0f8d395f2e3464f0dc1060497f7

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

src/Make_cyg_ming.mak

diff --git a/src/Make_cyg_ming.mak b/src/Make_cyg_ming.mak
index 0e21256..73db7fe 100644
--- a/src/Make_cyg_ming.mak
+++ b/src/Make_cyg_ming.mak
@@ -149,7 +149,7 @@
 
 # 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
 
 

src/version.c

diff --git a/src/version.c b/src/version.c
index 6dbbeb9..af29306 100644
--- a/src/version.c
+++ b/src/version.c
@@ -759,6 +759,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2034,
+/**/
     2033,
 /**/
     2032,