changeset 9507:5376c8008b3a v7.4.2034

commit https://github.com/vim/vim/commit/f62e797ffa6ab5d4c476b4c9e9a1f7f852910652 Author: Bram Moolenaar <Bram@vim.org> Date: Thu Jul 14 20:25:03 2016 +0200 patch 7.4.2034 Problem: Build fails with some version of MinGW. (illusorypan) Solution: Recognize mingw32. (Ken Takata, closes https://github.com/vim/vim/issues/921)
author Christian Brabandt <cb@256bit.org>
date Thu, 14 Jul 2016 20:30:08 +0200
parents 50853714bb28
children eab4723217e7
files src/Make_cyg_ming.mak src/version.c
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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
 
 
--- a/src/version.c
+++ b/src/version.c
@@ -759,6 +759,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2034,
+/**/
     2033,
 /**/
     2032,