# HG changeset patch # User Christian Brabandt # Date 1505250904 -7200 # Node ID 5df4b95cc3ee4b7e912f391a45fda038e43dc8cc # Parent 125bea27ed7163f02575af9d93cc70cab380859b patch 8.0.1098: build failure if libvterm installed commit https://github.com/vim/vim/commit/b984b80cd835a483bdca1928bc50eb09b071f373 Author: Bram Moolenaar Date: Tue Sep 12 22:59:58 2017 +0200 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 --- 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 --- a/src/version.c +++ b/src/version.c @@ -770,6 +770,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1098, +/**/ 1097, /**/ 1096,