thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.2.2432: libvterm tests are executed even when libtool doesn't work

Browse Source 
Problem:    Libvterm tests are executed even when libtool doesn't work.
Solution:   Only run libvterm tests if /usr/bin/gcc exists.
This commit is contained in:
Bram Moolenaar
2021-01-30 20:35:28 +01:00
parent ebd211c8a3
commit 76ab5446d5
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Makefile
View File

@@ -2294,9 +2294,12 @@ run_message_test: $(MESSAGE_TEST_TARGET)
# Run the libvterm tests. # Run the libvterm tests.
# This works only on GNU make, not on BSD make. # This works only on GNU make, not on BSD make.
# Libtool requires "gcc".
test_libvterm: test_libvterm:
@if $(MAKE) --version 2>/dev/null | grep -qs "GNU Make"; then \ @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 fi
# Run individual OLD style test. # Run individual OLD style test.

2
src/version.c
View File

@@ -750,6 +750,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
2432,
/**/ /**/
2431, 2431,
/**/ /**/