commit 3e946fdc7b3639f84c96cd8a5d5b4b4b010f56ea
author Bram Moolenaar <Bram@vim.org> Wed Jul 13 20:54:43 2016 +0200
committer Bram Moolenaar <Bram@vim.org> Wed Jul 13 20:54:43 2016 +0200
tree 73187cb31a3668baeeb08d23d6aa5a73f702c8c8
parent 89b10421ca1aea55acbafac1df93be4e20210ceb

patch 7.4.2032
Problem:    Build fails with 64 bit MinGW. (Axel Bender)
Solution:   Handle dash vs. underscore. (Ken Takata, Hirohito Higashi)

src/Make_cyg_ming.mak

diff --git a/src/Make_cyg_ming.mak b/src/Make_cyg_ming.mak
index 9bc2419..0e21256 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/-.*//')
+ARCH := $(shell $(CC) -dumpmachine | sed -e 's/-.*//' -e 's/_/-/')
 endif
 
 

src/version.c

diff --git a/src/version.c b/src/version.c
index 002c1f8..895937e 100644
--- a/src/version.c
+++ b/src/version.c
@@ -759,6 +759,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2032,
+/**/
     2031,
 /**/
     2030,