From 0f7df4fd147473f039ec6c497207326604a0d526 Mon Sep 17 00:00:00 2001
From: Ekdohibs <nathanael.courant@laposte.net>
Date: Sat, 8 Jun 2019 22:13:35 +0200
Subject: [PATCH] Fix a few errors in the ocamlc compile script

---
 Makefile | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 34d02e3..d677230 100644
--- a/Makefile
+++ b/Makefile
@@ -31,7 +31,15 @@ configure-ocaml: $(OCAMLSRC)
 	make -C $(OCAMLSRC) bytecomp/runtimedef.ml
 	make -C $(OCAMLSRC) CAMLLEX=ocamllex CAMLRUN=ocamlrun CAMLC=ocamlc bytecomp/opcodes.ml
 
-$(BOOT)/driver: $(OCAMLSRC)/driver configure-ocaml
+$(BOOT)/driver: $(OCAMLSRC)/driver $(OCAMLSRC)/otherlibs/dynlink configure-ocaml
+	mkdir -p $(BOOT)
+	rm -rf $@
+	cp -r $< $@
+	cp $(OCAMLSRC)/otherlibs/dynlink.mli $@/compdynlink.mli
+	grep -v 'REMOVE_ME for ../../debugger/dynlink.ml' \
+	     $(OCAMLSRC)/otherlibs/dynlink/dynlink.ml > $@/compdynlink.mlbyte
+
+$(BOOT)/byterun: $(OCAMLSRC)/byterun configure-ocaml
 	mkdir -p $(BOOT)
 	rm -rf $@
 	cp -r $< $@
@@ -71,4 +79,5 @@ copy: $(BOOT)/driver $(BOOT)/bytecomp $(BOOT)/typing $(BOOT)/parsing $(BOOT)/uti
 
 $(BOOT)/ocamlc: copy
 	cd $(BOOT)/stdlib && ../../compile_stdlib.sh
+	mkdir -p $(BOOT)/compilerlibs
 	cd $(BOOT) && ../compile_ocamlc.sh