Mercurial > vim

changeset 23782:82a8abc75070 v8.2.2432

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.2432: libvterm tests are executed even when libtool doesn't work Commit: https://github.com/vim/vim/commit/76ab5446d530a1c81ead0ee42cb55b4a4d515bad Author: Bram Moolenaar <Bram@vim.org> Date: Sat Jan 30 20:35:28 2021 +0100 patch 8.2.2432: libvterm tests are executed even when libtool doesn't work Problem: Libvterm tests are executed even when libtool doesn't work. Solution: Only run libvterm tests if /usr/bin/gcc exists.
author Bram Moolenaar <Bram@vim.org>
date Sat, 30 Jan 2021 20:45:04 +0100
parents 6430ca40fd3b
children de88fbcda74a
files src/Makefile src/version.c
diffstat 2 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/Makefile
+++ b/src/Makefile
@@ -2294,9 +2294,12 @@ run_message_test: $(MESSAGE_TEST_TARGET)
 
 # Run the libvterm tests.
 # This works only on GNU make, not on BSD make.
+# Libtool requires "gcc".
 test_libvterm:
 	@if $(MAKE) --version 2>/dev/null | grep -qs "GNU Make"; then \
-		cd libvterm; $(MAKE) -f Makefile test CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"; \
+	  if test -x "/usr/bin/gcc"; then \
+	    cd libvterm; $(MAKE) -f Makefile test CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"; \
+	  fi \
 	fi
 
 # Run individual OLD style test.
--- 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 */
 /**/
+    2432,
+/**/
     2431,
 /**/
     2430,