summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2018-09-21 14:43:10 +0200
committerBram Moolenaar <Bram@vim.org>2018-09-21 14:43:10 +0200
commit4ff4290de1a9c0fddc02b3fc84f5947bb09db06c (patch)
tree62aad860f0a2896aa9d745d6d0e6b82ea2358b26 /src
parent76c612a166a59be04d5a38dc8db3b76ee67a458b (diff)
patch 8.1.0422: cannot create map file with MinGWv8.1.0422
Problem: Cannot create map file with MinGW. Solution: Add support for $MAP. (Ken Takata, closes #3460)
Diffstat (limited to 'src')
-rw-r--r--src/Make_cyg_ming.mak7
-rw-r--r--src/version.c2
2 files changed, 9 insertions, 0 deletions
diff --git a/src/Make_cyg_ming.mak b/src/Make_cyg_ming.mak
index ca0fa97a3c..f3819517ec 100644
--- a/src/Make_cyg_ming.mak
+++ b/src/Make_cyg_ming.mak
@@ -35,6 +35,9 @@ FEATURES=HUGE
# set to yes for a debug build
DEBUG=no
+# set to yes to create a mapfile
+# MAP=yes
+
# set to SIZE for size, SPEED for speed, MAXSPEED for maximum optimization
OPTIMIZE=MAXSPEED
@@ -936,6 +939,10 @@ ifeq (yes, $(STATIC_WINPTHREAD))
LIB += -Wl,-Bstatic -lwinpthread -Wl,-Bdynamic
endif
+ifeq (yes, $(MAP))
+LFLAGS += -Wl,-Map=$(TARGET).map
+endif
+
all: $(TARGET) vimrun.exe xxd/xxd.exe install.exe uninstal.exe GvimExt/gvimext.dll
vimrun.exe: vimrun.c
diff --git a/src/version.c b/src/version.c
index c541dc9a15..372fe87f3f 100644
--- a/src/version.c
+++ b/src/version.c
@@ -795,6 +795,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 422,
+/**/
421,
/**/
420,