Commit 8830bf80 authored by POTTIER Francois's avatar POTTIER Francois

Revert "Cleaner way of passing flags to Menhir via -yaccflags."

Because ocamlbuild does not properly pass yaccflags to menhir --raw-depend.
This reverts commit 87c2b94c32cb90c7b141f6cc5e629d1d213ffc49.
parent ea8b46dd
...@@ -67,7 +67,7 @@ FLAGS := -v -lg 1 -la 1 -lc 1 --comment --infer --stdlib $(SRC) --strict --fixed ...@@ -67,7 +67,7 @@ FLAGS := -v -lg 1 -la 1 -lc 1 --comment --infer --stdlib $(SRC) --strict --fixed
stage2: stage2:
@$(OCAMLBUILD) -build-dir _stage2 -tag fancy_parser \ @$(OCAMLBUILD) -build-dir _stage2 -tag fancy_parser \
-use-menhir -menhir "$(SRC)/_stage1/menhir.$(TARGET)" -yaccflags "$(FLAGS)" \ -use-menhir -menhir "$(SRC)/_stage1/menhir.$(TARGET) $(FLAGS)" \
menhir.$(TARGET) menhir.$(TARGET)
# ---------------------------------------------------------------------------- # ----------------------------------------------------------------------------
...@@ -76,7 +76,7 @@ stage2: ...@@ -76,7 +76,7 @@ stage2:
# is identical to the stage 2 parser. # is identical to the stage 2 parser.
stage3: stage3:
@$(OCAMLBUILD) -build-dir _stage3 -tag fancy_parser \ @$(OCAMLBUILD) -build-dir _stage3 -tag fancy_parser \
-use-menhir -menhir "$(SRC)/_stage2/menhir.$(TARGET)" -yaccflags "$(FLAGS)" \ -use-menhir -menhir "$(SRC)/_stage2/menhir.$(TARGET) $(FLAGS)" \
parser.ml parser.mli parser.ml parser.mli
@for i in parser.ml parser.mli ; do \ @for i in parser.ml parser.mli ; do \
if ! diff _stage2/$$i _stage3/$$i 2>&1 >/dev/null ; then \ if ! diff _stage2/$$i _stage3/$$i 2>&1 >/dev/null ; then \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment