summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2012-03-28 17:17:48 +0200
committerBram Moolenaar <Bram@vim.org>2012-03-28 17:17:48 +0200
commitda5a4970a9e143ca5c936d28ad1709edba07d3b0 (patch)
tree8edb2b4f4ceb333f5ad9271c13960a973e6fa405
parentf99bc6d0021353efe0e297663d71348fd741abde (diff)
downloadvim-git-da5a4970a9e143ca5c936d28ad1709edba07d3b0.tar.gz
updated for version 7.3.485v7.3.485
Problem: When building Vim LDFLAGS isn't passed on to building xxd. Solution: Pass the LDFLAGS value. (James McCoy)
-rw-r--r--src/Makefile2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/Makefile b/src/Makefile
index 754739f08..8197b120d 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1720,7 +1720,7 @@ $(VIMTARGET): auto/config.mk objects $(OBJ) version.c version.h
sh $(srcdir)/link.sh
xxd/xxd$(EXEEXT): xxd/xxd.c
- cd xxd; CC="$(CC)" CFLAGS="$(CPPFLAGS) $(CFLAGS)" \
+ cd xxd; CC="$(CC)" CFLAGS="$(CPPFLAGS) $(CFLAGS)" LDFLAGS="$(LDFLAGS)" \
$(MAKE) -f Makefile
# Build the language specific files if they were unpacked.
diff --git a/src/version.c b/src/version.c
index f9a1391fd..200913318 100644
--- a/src/version.c
+++ b/src/version.c
@@ -715,6 +715,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 485,
+/**/
484,
/**/
483,