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 0e21256ec85d82a7309f38d4863d36afa46355e0..73db7fea1f4f6e3b8ec14a2f1989bb6396f4414f 100644 (file)
--- 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 6dbbeb9ce0c6e901152f1ad040a6c46c73d06b35..af29306e12d56b3421c32c712f64b57f75b56c98 100644 (file)
--- 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,
 /**/