# HG changeset patch # User Bram Moolenaar # Date 1612035904 -3600 # Node ID 82a8abc75070b4f34072bcce26478f505bbe1994 # Parent 6430ca40fd3b7fed61bd3707095824d80cd147b8 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 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. diff --git a/src/Makefile b/src/Makefile --- 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 --- 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,