From: Bram Moolenaar <Bram@vim.org>
Date: Sat, 30 Jan 2021 19:35:28 +0000 (+0100)
Subject: patch 8.2.2432: libvterm tests are executed even when libtool doesn't work
X-Git-Tag: v8.2.2432
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=76ab5446d530a1c81ead0ee42cb55b4a4d515bad;p=vim

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.
---

diff --git a/src/Makefile b/src/Makefile
index c30af8b29..4e32814ff 100644
--- 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.
diff --git a/src/version.c b/src/version.c
index 6854c10fd..dc20c3349 100644
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2432,
 /**/
     2431,
 /**/