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)

diff --git a/src/Makefile b/src/Makefile
index 754739f08d1db727ce8b441952ee01dd3ff20406..8197b120d220732d19229d29d83e4bd42302de74 100644 (file)
--- 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 f9a1391fd6d0cfe1101e7b65b4effc2f4bd0321e..200913318970a07e464ba24c471d78fb911d8ee0 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -714,6 +714,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    485,
 /**/
     484,
 /**/