summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIan Romanick <[email protected]>2010-08-11 17:19:05 -0700
committerIan Romanick <[email protected]>2010-08-11 17:21:53 -0700
commit5a805079a8d209e843661941730ecfebb65d2913 (patch)
tree593818d260759ae24cee5e54544bfd92dc47eb6a
parenta43871f763043a2ed6f3ab9f52d3cff32c63e47e (diff)
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.
-rw-r--r--src/glsl/Makefile2
1 files changed, 1 insertions, 1 deletions
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 $<