commit b984b80cd835a483bdca1928bc50eb09b071f373
author Bram Moolenaar <Bram@vim.org> Tue Sep 12 22:59:58 2017 +0200
committer Bram Moolenaar <Bram@vim.org> Tue Sep 12 22:59:58 2017 +0200
tree 4f225b257ad11ef4be1b5e084b36fa449eb4f2a6
parent 49a613f84aaa7cccd1d12a2ffc4ebb1956f973aa

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)

src/Makefile

diff --git a/src/Makefile b/src/Makefile
index 0cb0058..247fee6 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -3299,7 +3299,7 @@
 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