summaryrefslogtreecommitdiff
path: root/src/Makefile
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2017-09-12 22:59:58 +0200
committerBram Moolenaar <Bram@vim.org>2017-09-12 22:59:58 +0200
commitb984b80cd835a483bdca1928bc50eb09b071f373 (patch)
tree4f225b257ad11ef4be1b5e084b36fa449eb4f2a6 /src/Makefile
parent49a613f84aaa7cccd1d12a2ffc4ebb1956f973aa (diff)
downloadvim-git-b984b80cd835a483bdca1928bc50eb09b071f373.tar.gz
patch 8.0.1098: build failure if libvterm installedv8.0.1098
Problem: Build failure if libvterm installed on the system. (Oleh Hushchenkov) Solution: Change the CCCTERM argument order. (Ken Takata, closes #2080)
Diffstat (limited to 'src/Makefile')
-rw-r--r--src/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Makefile b/src/Makefile
index 0cb00589f..247fee610 100644
--- 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