summaryrefslogtreecommitdiffstats
path: root/usr.bin/lex/main.c
diff options
context:
space:
mode:
authormillert <millert@openbsd.org>2015-11-20 04:07:43 +0000
committermillert <millert@openbsd.org>2015-11-20 04:07:43 +0000
commit8137533b03b8e86d12a3a80a65af3f231a2ec742 (patch)
tree1fcdb703cfabae0994b98d90022e6df99873c8b7 /usr.bin/lex/main.c
parentBack out rev 1.22 which somehow had unreported merge conflicts. (diff)
downloadwireguard-openbsd-8137533b03b8e86d12a3a80a65af3f231a2ec742.tar.xz
wireguard-openbsd-8137533b03b8e86d12a3a80a65af3f231a2ec742.zip
Always use the system m4; OK tedu@
Diffstat (limited to 'usr.bin/lex/main.c')
-rw-r--r--usr.bin/lex/main.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/usr.bin/lex/main.c b/usr.bin/lex/main.c
index bcbe93d0731..ae4253b771d 100644
--- a/usr.bin/lex/main.c
+++ b/usr.bin/lex/main.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: main.c,v 1.23 2015/11/20 04:06:48 millert Exp $ */
+/* $OpenBSD: main.c,v 1.24 2015/11/20 04:07:43 millert Exp $ */
/* flex - tool to generate fast lexical analyzers */
@@ -229,7 +229,6 @@ void
check_options()
{
int i;
- const char *m4 = NULL;
if (lex_compat) {
if (C_plus_plus)
@@ -352,9 +351,7 @@ check_options()
}
/* Setup the filter chain. */
output_chain = filter_create_int(NULL, filter_tee_header, headerfilename);
- if (!(m4 = getenv("M4")))
- m4 = M4;
- filter_create_ext(output_chain, m4, "-P", 0);
+ filter_create_ext(output_chain, M4, "-P", 0);
filter_create_int(output_chain, filter_fix_linedirs, NULL);
/* For debugging, only run the requested number of filters. */