changeset 12437:5df4b95cc3ee v8.0.1098

patch 8.0.1098: build failure if libvterm installed commit https://github.com/vim/vim/commit/b984b80cd835a483bdca1928bc50eb09b071f373 Author: Bram Moolenaar <Bram@vim.org> 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)
author Christian Brabandt <cb@256bit.org>
date Tue, 12 Sep 2017 23:15:04 +0200
parents 125bea27ed71
children 199f465df4d3
files src/Makefile src/version.c
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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,