diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-09-12 22:59:58 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-09-12 22:59:58 +0200 |
| commit | b984b80cd835a483bdca1928bc50eb09b071f373 (patch) | |
| tree | 4f225b257ad11ef4be1b5e084b36fa449eb4f2a6 | |
| parent | 49a613f84aaa7cccd1d12a2ffc4ebb1956f973aa (diff) | |
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)
| -rw-r--r-- | src/Makefile | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/Makefile b/src/Makefile index 0cb00589f4..247fee6100 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 diff --git a/src/version.c b/src/version.c index b7adf03a97..346d201f8f 100644 --- 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, |