From: Ian Romanick <ian.d.romanick@intel.com>
Date: Thu, 12 Aug 2010 00:19:05 +0000 (-0700)
Subject: glsl2: Change command line options passed to flex
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5a805079a8d209e843661941730ecfebb65d2913;p=mesa.git

glsl2: Change command line options passed to flex

Remove --never-interactive because it is already specified in the
source using %option.  Use -o instead of --outfile.  Some of the
%option commands may also need to be removed for compatibility with
older versions (e.g., 2.5.4) of flex.

This should fix bugzilla #29209.
---

diff --git a/src/glsl/Makefile b/src/glsl/Makefile
index a0ab1d6d401..3e480685bdf 100644
--- a/src/glsl/Makefile
+++ b/src/glsl/Makefile
@@ -151,7 +151,7 @@ glcpp/glcpp: $(GLCPP_OBJECTS) libglsl.a
 	$(CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@
 
 glsl_lexer.cpp: glsl_lexer.lpp
-	flex --never-interactive --outfile="$@"  $<
+	flex -o$@  $<
 
 glsl_parser.cpp: glsl_parser.ypp
 	bison -v -o "$@" -p "_mesa_glsl_" --defines=glsl_parser.h $<