Skip to content

Commit 76ab544

Browse files
committed
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.
1 parent ebd211c commit 76ab544

2 files changed

Lines changed: 6 additions & 1 deletion

File tree

src/Makefile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2294,9 +2294,12 @@ run_message_test: $(MESSAGE_TEST_TARGET)
22942294

22952295
# Run the libvterm tests.
22962296
# This works only on GNU make, not on BSD make.
2297+
# Libtool requires "gcc".
22972298
test_libvterm:
22982299
@if $(MAKE) --version 2>/dev/null | grep -qs "GNU Make"; then \
2299-
cd libvterm; $(MAKE) -f Makefile test CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"; \
2300+
if test -x "/usr/bin/gcc"; then \
2301+
cd libvterm; $(MAKE) -f Makefile test CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"; \
2302+
fi \
23002303
fi
23012304

23022305
# Run individual OLD style test.

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -750,6 +750,8 @@ static char *(features[]) =
750750

751751
static int included_patches[] =
752752
{ /* Add new patch number below this line */
753+
/**/
754+
2432,
753755
/**/
754756
2431,
755757
/**/

0 commit comments

Comments
 (0)