Fix build for modern menhir versions

INRIA · Aug 23, 2020 · 0b6071e · 0b6071e
1 parent 2b0e57c
commit 0b6071e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/compiler/Makefile b/compiler/Makefile
@@ -107,19 +107,19 @@ byte: $(BIN).byte
 
 $(BIN).opt: $(GENSOURCES) $(OBJ:%.cmo=%.cmx) main/main.cmx
 	$(OCAMLOPT) $(UNIXX) $(OCAMLOPTFLAGS) $(INCLUDES) \
-	-I $(MENHIRLIB) menhirLib.cmx $(OBJ:%.cmo=%.cmx) main/main.cmx \
+	-I $(MENHIRLIB) menhirLib.cmxa $(OBJ:%.cmo=%.cmx) main/main.cmx \
 	-o $(BIN).opt
 
 $(BIN).byte: $(GENSOURCES) $(OBJ) main/main.cmo
 	$(OCAMLC) $(UNIX) $(OCAMLFLAGS) $(INCLUDES) \
-        -I $(MENHIRLIB) menhirLib.cmo $(OBJ) main/main.cmo \
+        -I $(MENHIRLIB) menhirLib.cma $(OBJ) main/main.cmo \
 	-o $(BIN).byte
 
 debug: OCAMLFLAGS += -g
 debug: byte debugprinter.cma
 
 debugprinter.cma: $(OBJ)
-	$(OCAMLC) -a -o $@ -I $(MENHIRLIB) menhirLib.cmo $^
+	$(OCAMLC) -a -o $@ -I $(MENHIRLIB) menhirLib.cma $^
 
 # Extra dependences
 

diff --git a/tools/zlsdep/Makefile b/tools/zlsdep/Makefile
@@ -26,7 +26,7 @@ INCLUDES = $(DIRECTORIES:%=-I %)
 
 byte: $(BIN).byte
 $(BIN).byte: $(OBJ)
-	$(OCAMLC) $(OCAMLFLAGS) $(INCLUDES) -I $(MENHIRLIB) menhirLib.cmo $(OBJ) -o $(BIN).byte
+	$(OCAMLC) $(OCAMLFLAGS) $(INCLUDES) -I $(MENHIRLIB) menhirLib.cma $(OBJ) -o $(BIN).byte
 	ln -sf $(BIN).byte $(BIN)