From 0b6071ef6b4c11258be988aeee4ef782f041e4d8 Mon Sep 17 00:00:00 2001
From: Timothy Bourke <tim@tbrk.org>
Date: Sun, 23 Aug 2020 13:06:15 +0200
Subject: [PATCH] Fix build for modern menhir versions

---
 compiler/Makefile     | 6 +++---
 tools/zlsdep/Makefile | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/compiler/Makefile b/compiler/Makefile
index 22fb1af8..3fa1a0b5 100644
--- 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
index b325220b..1996b115 100644
--- 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)