Changes in directory llvm:
Makefile.rules updated: 1.395 -> 1.396 configure updated: 1.248 -> 1.249 --- Log message: For PR738: http://llvm.org/PR738 : Demote check for bison from error to warning and make sure that the makefile can handle an empty definition for BISON variable. --- Diffs of the changes: (+7 -3) Makefile.rules | 4 ++++ configure | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) Index: llvm/Makefile.rules diff -u llvm/Makefile.rules:1.395 llvm/Makefile.rules:1.396 --- llvm/Makefile.rules:1.395 Fri Aug 18 12:22:07 2006 +++ llvm/Makefile.rules Thu Aug 24 17:41:20 2006 @@ -1315,10 +1315,14 @@ # Rule for building the bison based parsers... $(PROJ_SRC_DIR)/%.cpp $(PROJ_SRC_DIR)/%.h : $(PROJ_SRC_DIR)/%.y +ifneq ($(BISON),) $(Echo) "Bisoning $*.y" $(Verb) $(BISON) -v -d -p $(<F:%Parser.y=%) -o $*.tab.c $< $(Verb) $(MV) -f $*.tab.c $(PROJ_SRC_DIR)/$*.cpp $(Verb) $(MV) -f $*.tab.h $(PROJ_SRC_DIR)/$*.h +else + $(Echo) "Bison of $*.y SKIPPED -- bison not found" +endif # IFF the .y file has changed since it was last checked into CVS, copy the .y # file to .y.cvs and the generated .cpp/.h file to .cpp.cvs/.h.cvs. We use this Index: llvm/configure diff -u llvm/configure:1.248 llvm/configure:1.249 --- llvm/configure:1.248 Tue Aug 22 17:21:37 2006 +++ llvm/configure Thu Aug 24 17:41:20 2006 @@ -6365,9 +6365,9 @@ { echo "$as_me:$LINENO: result: $llvm_cv_has_bison" >&5 echo "${ECHO_T}$llvm_cv_has_bison" >&6; } if test "$YACC" != "bison -y"; then - { { echo "$as_me:$LINENO: error: bison not found but required" >&5 -echo "$as_me: error: bison not found but required" >&2;} - { (exit 1); exit 1; }; } + + { echo "$as_me:$LINENO: WARNING: bison not found, can't rebuild grammars" >&5 +echo "$as_me: WARNING: bison not found, can't rebuild grammars" >&2;} else BISON=bison _______________________________________________ llvm-commits mailing list llvm-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
