diff options
| author | Reid Spencer <rspencer@reidspencer.com> | 2006-08-24 22:41:20 +0000 |
|---|---|---|
| committer | Reid Spencer <rspencer@reidspencer.com> | 2006-08-24 22:41:20 +0000 |
| commit | 4869d7fa8e7daeaafc8b86c6f54efd41517f0f14 (patch) | |
| tree | 38c44c1b2be8bb1b6faa6c17cce81e1c6428e2d7 | |
| parent | 7b7a1be8561c0cfda11b5ff287aa115cb1e68df5 (diff) | |
For PR738:
Demote check for bison from error to warning and make sure that the
makefile can handle an empty definition for BISON variable.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@29861 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | Makefile.rules | 4 | ||||
| -rw-r--r-- | autoconf/m4/bison.m4 | 5 | ||||
| -rwxr-xr-x | configure | 6 |
3 files changed, 10 insertions, 5 deletions
diff --git a/Makefile.rules b/Makefile.rules index 42c367a949..808e2b5a76 100644 --- a/Makefile.rules +++ b/Makefile.rules @@ -1315,10 +1315,14 @@ all:: $(YaccFiles:%.y=$(PROJ_SRC_DIR)/%.cpp.cvs) # 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 diff --git a/autoconf/m4/bison.m4 b/autoconf/m4/bison.m4 index e186af0101..48b83cc4a6 100644 --- a/autoconf/m4/bison.m4 +++ b/autoconf/m4/bison.m4 @@ -8,7 +8,8 @@ AC_DEFUN([AC_PROG_BISON], [AC_CACHE_CHECK([],[llvm_cv_has_bison],[AC_PROG_YACC()]) if test "$YACC" != "bison -y"; then - AC_MSG_ERROR([bison not found but required]) + AC_SUBST(BISON,[]) + AC_MSG_WARN([bison not found, can't rebuild grammars]) else - AC_SUBST(BISON,[bison],[location of bison]) + AC_SUBST(BISON,[bison]) fi]) @@ -6365,9 +6365,9 @@ fi { 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 |