summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2021-01-30 20:35:28 +0100
committerBram Moolenaar <Bram@vim.org>2021-01-30 20:35:28 +0100
commit76ab5446d530a1c81ead0ee42cb55b4a4d515bad (patch)
tree244d231fefab4c9de8762209d33f0dee13ff7796
parentebd211c8a39871c88189c8cda9e624eb30b300b3 (diff)
patch 8.2.2432: libvterm tests are executed even when libtool doesn't workv8.2.2432
Problem: Libvterm tests are executed even when libtool doesn't work. Solution: Only run libvterm tests if /usr/bin/gcc exists.
-rw-r--r--src/Makefile5
-rw-r--r--src/version.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/src/Makefile b/src/Makefile
index c30af8b295..4e32814ffd 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 6854c10fd5..dc20c3349c 100644
--- 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,