Mercurial > vim

changeset 3439:94374e0b6267 v7.3.485

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated for version 7.3.485 Problem: When building Vim LDFLAGS isn't passed on to building xxd. Solution: Pass the LDFLAGS value. (James McCoy)
author Bram Moolenaar <bram@vim.org>
date Wed, 28 Mar 2012 17:17:48 +0200
parents 6d1ce88aa8c5
children 8dc485c4ee3e
files src/Makefile src/version.c
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/Makefile
+++ b/src/Makefile
@@ -1720,7 +1720,7 @@ CCC = $(CC) -c -I$(srcdir) $(ALL_CFLAGS)
 		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.
--- 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,