patch 8.0.1098: build failure if libvterm installed

Problem:    Build failure if libvterm installed on the system. (Oleh
            Hushchenkov)
Solution:   Change the CCCTERM argument order. (Ken Takata, closes #2080)

diff --git a/src/Makefile b/src/Makefile
index 0cb00589f4c0c219e94bdc6153728d507958449e..247fee61004d2fc8ac83ee79b5d95b9e677e2316 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -3299,7 +3299,7 @@ objects/channel.o: channel.c
 Makefile:
        @echo The name of the makefile MUST be "Makefile" (with capital M)!!!!
 
-CCCTERM = $(CCC) -Ilibvterm/include -DINLINE="" \
+CCCTERM = $(CCC_NF) -Ilibvterm/include $(ALL_CFLAGS) -DINLINE="" \
          -DVSNPRINTF=vim_vsnprintf \
          -DIS_COMBINING_FUNCTION=utf_iscomposing_uint \
          -DWCWIDTH_FUNCTION=utf_uint2cells

diff --git a/src/version.c b/src/version.c
index b7adf03a97faecbe28702eea085481cf76235194..346d201f8f7a720397f69050c01f810c8e9275c2 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -769,6 +769,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1098,
 /**/
     1097,
 /**/