diff options
| author | Mike Stump <mrs@gcc.gnu.org> | 1994-03-23 23:33:53 +0000 |
|---|---|---|
| committer | Mike Stump <mrs@gcc.gnu.org> | 1994-03-23 23:33:53 +0000 |
| commit | 51c184be092792a7df35662dee52448c7b17fcb3 (patch) | |
| tree | 50fb55018ee5664cebe5d87e245abecdf1af7630 /gcc/cp/Makefile.in | |
| parent | d7a58f30d1ba7672aeee5a6c68c8dd56690601e7 (diff) | |
| download | gcc-51c184be092792a7df35662dee52448c7b17fcb3.zip gcc-51c184be092792a7df35662dee52448c7b17fcb3.tar.gz gcc-51c184be092792a7df35662dee52448c7b17fcb3.tar.bz2 | |
30th Cygnus<->FSF merge.
From-SVN: r6859
Diffstat (limited to 'gcc/cp/Makefile.in')
| -rw-r--r-- | gcc/cp/Makefile.in | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/gcc/cp/Makefile.in b/gcc/cp/Makefile.in index 686b5b5..5b2a422 100644 --- a/gcc/cp/Makefile.in +++ b/gcc/cp/Makefile.in @@ -44,10 +44,9 @@ X_CPPFLAGS = T_CPPFLAGS = CC = cc -# CYGNUS LOCAL: we use byacc instead of bison, DO NOT SEND TO RMS -BISON = `if [ -f ../../byacc/byacc ] ; then echo ../../byacc/byacc ; else echo byacc ; fi` +BISON = bison BISONFLAGS = -LEX = `if [ -f ../../flex/flex ] ; then echo ../../flex/flex ; else echo flex ; fi` +LEX = flex LEXFLAGS= AR = ar OLDAR_FLAGS = qc @@ -204,7 +203,7 @@ parse.o : $(srcdir)/parse.c $(CONFIG_H) $(CXX_TREE_H) ../flags.h lex.h `echo $(srcdir)/parse.c | sed 's,^\./,,'` $(srcdir)/parse.c $(srcdir)/parse.h : $(srcdir)/parse.y - @echo expect 28 shift/reduce conflicts, 14 reduce/reduce conflicts. + @echo expect 24 reduce/reduce conflicts. cd $(srcdir); $(BISON) $(BISONFLAGS) -d -o parse.c parse.y cd $(srcdir); grep '^#define[ ]*YYEMPTY' parse.c >>parse.h |