mesa: check that flex/bison are installed
Fixes https://bugs.freedesktop.org/show_bug.cgi?id=36651 NOTE: This is a candidate for the 7.10 branch.
This commit is contained in:
+4
-4
@@ -192,16 +192,16 @@ $(DRICORE_OBJ_DIR)/%.o : %.c
|
||||
$(CC) -c $(INCLUDES) $(DRI_CFLAGS) $(DEFINES) $< -o $@
|
||||
|
||||
glsl_lexer.cpp: glsl_lexer.ll
|
||||
flex --nounistd -o$@ $<
|
||||
$(FLEX) --nounistd -o$@ $<
|
||||
|
||||
glsl_parser.cpp: glsl_parser.yy
|
||||
bison -v -o "$@" -p "_mesa_glsl_" --defines=glsl_parser.h $<
|
||||
$(BISON) -v -o "$@" -p "_mesa_glsl_" --defines=glsl_parser.h $<
|
||||
|
||||
glcpp/glcpp-lex.c: glcpp/glcpp-lex.l
|
||||
flex --nounistd -o$@ $<
|
||||
$(FLEX) --nounistd -o$@ $<
|
||||
|
||||
glcpp/glcpp-parse.c: glcpp/glcpp-parse.y
|
||||
bison -v -o "$@" --defines=glcpp/glcpp-parse.h $<
|
||||
$(BISON) -v -o "$@" --defines=glcpp/glcpp-parse.h $<
|
||||
|
||||
builtin_compiler: $(GLSL2_OBJECTS) $(OBJECTS) builtin_stubs.o
|
||||
$(APP_CXX) $(INCLUDES) $(CXXFLAGS) $(LDFLAGS) $(OBJECTS) $(GLSL2_OBJECTS) builtin_stubs.o -o $@
|
||||
|
||||
+2
-2
@@ -75,10 +75,10 @@ main/api_exec_es2.c: main/APIspec.xml main/es_generator.py main/APIspecutil.py m
|
||||
$(PYTHON2) $(PYTHON_FLAGS) main/es_generator.py -S main/APIspec.xml -V GLES2.0 > $@
|
||||
|
||||
program/program_parse.tab.c program/program_parse.tab.h: program/program_parse.y
|
||||
bison -v -d --output=program/program_parse.tab.c $<
|
||||
$(BISON) -v -d --output=program/program_parse.tab.c $<
|
||||
|
||||
program/lex.yy.c: program/program_lexer.l
|
||||
flex --never-interactive --outfile=$@ $<
|
||||
$(FLEX) --never-interactive --outfile=$@ $<
|
||||
|
||||
######################################################################
|
||||
# Helper libraries used by many drivers:
|
||||
|
||||
Reference in New Issue
Block a user