# HG changeset patch # User Christian Brabandt # Date 1468521008 -7200 # Node ID 5376c8008b3a79ecb446e3d7923a03333decab6c # Parent 50853714bb289b61732e791ebf14dda1527f7391 commit https://github.com/vim/vim/commit/f62e797ffa6ab5d4c476b4c9e9a1f7f852910652 Author: Bram Moolenaar 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) diff --git a/src/Make_cyg_ming.mak b/src/Make_cyg_ming.mak --- 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 --- 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,