diff options
| author | Brooks Davis <brooks@FreeBSD.org> | 2014-01-30 21:08:36 +0000 |
|---|---|---|
| committer | Brooks Davis <brooks@FreeBSD.org> | 2014-01-30 21:08:36 +0000 |
| commit | 38e233371c34a7ffe3bbb1ffd6c1d3f3d0479681 (patch) | |
| tree | 274baf7c9ba25224bc6f2c68d144d98c43f7e4e8 /usr.bin/vi | |
| parent | 7ecf8b1c67d17dd602911d0d172e549e21a1934a (diff) | |
Merge from CheriBSD:
commit c1acf022c533c5ae27e0cd556977eafe3f5959eb
Author: Brooks Davis <brooks@one-eyed-alien.net>
Date: Fri Jan 17 21:46:44 2014 +0000
Add an option WITHOUT_NCURSESW to suppress building and linking to
libncursesw. While wide character support it useful we'd like to
only need one ncurses library on embedded systems.
MFC after: 4 weeks
Sponsored by: DARPA, AFRL
Notes
Notes:
svn path=/head/; revision=261296
Diffstat (limited to 'usr.bin/vi')
| -rw-r--r-- | usr.bin/vi/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/usr.bin/vi/Makefile b/usr.bin/vi/Makefile index 033c4726a142..445d79fba2f7 100644 --- a/usr.bin/vi/Makefile +++ b/usr.bin/vi/Makefile @@ -36,7 +36,7 @@ CFLAGS+=-I${.CURDIR} -I${SRCDIR} -I${SRCDIR}/regex DPADD= ${LIBUTIL} LDADD= -lutil -.if defined(RESCUE) || defined(RELEASE_CRUNCH) +.if defined(RESCUE) || defined(RELEASE_CRUNCH) || ${MK_NCURSESW} == "no" DPADD+= ${LIBNCURSES} LDADD+= -lncurses .else |