diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-07-14 20:25:03 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-07-14 20:25:03 +0200 |
| commit | f62e797ffa6ab5d4c476b4c9e9a1f7f852910652 (patch) | |
| tree | 0acabe5f6f95219470d1e58b30e66add737a0fae | |
| parent | 6d20e1754461b0f8d395f2e3464f0dc1060497f7 (diff) | |
| download | vim-git-f62e797ffa6ab5d4c476b4c9e9a1f7f852910652.tar.gz | |
patch 7.4.2034v7.4.2034
Problem: Build fails with some version of MinGW. (illusorypan)
Solution: Recognize mingw32. (Ken Takata, closes #921)
| -rw-r--r-- | src/Make_cyg_ming.mak | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/Make_cyg_ming.mak b/src/Make_cyg_ming.mak index 0e21256ec..73db7fea1 100644 --- 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 6dbbeb9ce..af29306e1 100644 --- 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, |