changeset 23086:d020ba29f111 v8.2.2089

patch 8.2.2089: libvterm test fails to build on Mac Commit: https://github.com/vim/vim/commit/6cd42db9dc1251b052b97d47bafc063eacac1b3e Author: Bram Moolenaar <Bram@vim.org> Date: Fri Dec 4 18:09:54 2020 +0100 patch 8.2.2089: libvterm test fails to build on Mac Problem: Libvterm test fails to build on Mac. Solution: Adjust configure to remove a space between -L and the path that follows.
author Bram Moolenaar <Bram@vim.org>
date Fri, 04 Dec 2020 18:15:04 +0100
parents 1db630e5efd2
children ca8a14cbafb6
files src/auto/configure src/configure.ac src/version.c
diffstat 3 files changed, 8 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -14861,6 +14861,8 @@ else
 $as_echo "no" >&6; }
 fi
 
+LDFLAGS=`echo "$LDFLAGS" | sed -e 's/-L /-L/g'`
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking linker --as-needed support" >&5
 $as_echo_n "checking linker --as-needed support... " >&6; }
 LINK_AS_NEEDED=
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -4467,6 +4467,10 @@ else
   AC_MSG_RESULT(no)
 fi
 
+dnl $LDFLAGS is passed to glibtool in libvterm, it doesn't like a space
+dnl between "-L" and the path that follows.
+LDFLAGS=`echo "$LDFLAGS" | sed -e 's/-L /-L/g'`
+
 dnl link.sh tries to avoid overlinking in a hackish way.
 dnl At least GNU ld supports --as-needed which provides the same functionality
 dnl at linker level. Let's use it.
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2089,
+/**/
     2088,
 /**/
     2087,