make acid build with bison.

ask for bison explicitly in cc, gc to try to
avoid problems with other yaccs that
might be installed.

R=r
DELTA=29  (10 added, 2 deleted, 17 changed)
OCL=22110
CL=22113

diff --git a/src/cmd/cc/Makefile b/src/cmd/cc/Makefile
index 61aec26a72274d34cd7bd35d0738f097fa9255ec..9eea5a17899ddbabd582ae260ce3fb5f72a3ea49 100644 (file)
--- a/src/cmd/cc/Makefile
+++ b/src/cmd/cc/Makefile
@@ -10,7 +10,6 @@ LIB=\
 HFILES=\
        cc.h\
        y.tab.h\
-       compat.h\
 
 YFILES=\
        cc.y\
@@ -28,10 +27,8 @@ OFILES=\
        funct.$O\
        sub.$O\
        com64.$O\
-       compat.$O\
        dpchk.$O\
        omachcap.$O\
-       compat.$O\
 
 $(LIB): $(OFILES)
        ar rsc $(LIB) $(OFILES)
@@ -39,7 +36,7 @@ $(LIB): $(OFILES)
 $(OFILES): $(HFILES)
 
 y.tab.h: $(YFILES)
-       yacc $(YFLAGS) $(YFILES)
+       bison -y $(YFLAGS) $(YFILES)
 
 y.tab.c: y.tab.h
        test -f y.tab.c && touch y.tab.c

diff --git a/src/cmd/gc/Makefile b/src/cmd/gc/Makefile
index 6c8834d2f29b9a328bc648eddb4799b3deb77539..1ab4497689f1de1af608d610a886f5b5cc128316 100644 (file)
--- a/src/cmd/gc/Makefile
+++ b/src/cmd/gc/Makefile
@@ -34,7 +34,7 @@ $(LIB): $(OFILES)
 $(OFILES): $(HFILES)
 
 y.tab.h: $(YFILES)
-       yacc $(YFLAGS) $(YFILES)
+       bison -y $(YFLAGS) $(YFILES)
 
 y.tab.c: y.tab.h
        test -f y.tab.c && touch y.tab.c