[src/trunk]: src/external/bsd/nvi/usr.bin/nvi we don't need the extra copy wi...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/e89f77f16cb3
branches:  trunk
changeset: 959804:e89f77f16cb3
user:      christos <christos%NetBSD.org@localhost>
date:      Thu Feb 25 21:56:35 2021 +0000

description:
we don't need the extra copy wide-regex anymore.

diffstat:

 external/bsd/nvi/usr.bin/nvi/Makefile |  14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diffs (37 lines):

diff -r 3fecd1a9f812 -r e89f77f16cb3 external/bsd/nvi/usr.bin/nvi/Makefile
--- a/external/bsd/nvi/usr.bin/nvi/Makefile     Thu Feb 25 21:47:46 2021 +0000
+++ b/external/bsd/nvi/usr.bin/nvi/Makefile     Thu Feb 25 21:56:35 2021 +0000
@@ -1,18 +1,15 @@
-#      $NetBSD: Makefile,v 1.22 2020/04/20 13:04:10 joerg Exp $
+#      $NetBSD: Makefile,v 1.23 2021/02/25 21:56:35 christos Exp $
 
 .include <bsd.own.mk>
 
 USE_WIDECHAR?=yes
+USE_BUILTIN_REGEX?=no  # Our regex supports widechar
 
 WARNS= 5
 
 COPTS.exf.c+=          -Wno-format-nonliteral
 COPTS.msg.c+=          -Wno-format-nonliteral
-.if ${USE_WIDECHAR} == "yes"
-.if ${ACTIVE_CC} == "gcc"
-COPTS.regexec.c+=      -Wno-old-style-definition
-.endif
-.else
+.if ${USE_WIDECHAR} != "yes"
 COPTS.v_increment.c+=  -Wno-format-nonliteral
 CWARNFLAGS.gcc+=       -Wno-unused
 CWARNFLAGS.clang+=     -Wno-unsequenced
@@ -57,7 +54,10 @@
        ip_run.c ip_send.c ip_trans.c ipc_cmd.c ipc_method.c
 
 # For wide char support
-.if ${USE_WIDECHAR} == "yes"
+.if ${USE_BUILTIN_REGEX} == "yes"
+.if ${ACTIVE_CC} == "gcc"
+COPTS.regexec.c+=      -Wno-old-style-definition
+.endif
 SRCS+= regcomp.c regerror.c regexec.c regfree.c
 CPPFLAGS+=-I${DIST}/regex -D__REGEX_PRIVATE -DUSE_WIDECHAR
 .endif