From 5c53d505c1edfd977b3a85c6227765a542df9c53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nathana=C3=ABl=20Courant?= <nathanael.courant@inria.fr>
Date: Wed, 17 Feb 2021 08:40:41 +0100
Subject: [PATCH] Fix Makefile

---
 Makefile          | 2 ++
 compile_ocamlc.sh | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 81cadae..acea4f2 100644
--- a/Makefile
+++ b/Makefile
@@ -6,6 +6,7 @@ GENERATED=$(OCAMLSRC)/bytecomp/opcodes.ml
 
 $(OCAMLRUN): $(CONFIG)
 	make -C $(OCAMLSRC)/byterun all
+	make -C $(OCAMLSRC)/asmrun all
 
 .PHONY: configure-ocaml
 configure-ocaml:
@@ -94,6 +95,7 @@ $(BOOT)/stdlib: $(OCAMLSRC)/stdlib $(CONFIG) $(GENERATED) patches/compflags.patc
 	patch $(BOOT)/stdlib/Compflags patches/compflags.patch
 	awk -f $(BOOT)/stdlib/expand_module_aliases.awk < $(BOOT)/stdlib/stdlib.mli > $(BOOT)/stdlib/stdlib.pp.mli
 	awk -f $(BOOT)/stdlib/expand_module_aliases.awk < $(BOOT)/stdlib/stdlib.ml > $(BOOT)/stdlib/stdlib.pp.ml
+	cp $(OCAMLSRC)/asmrun/libasmrun.a $(BOOT)/stdlib/
 
 COPY_TARGETS=\
 	$(BOOT)/bytecomp \
diff --git a/compile_ocamlc.sh b/compile_ocamlc.sh
index 72a33a1..703aff5 100755
--- a/compile_ocamlc.sh
+++ b/compile_ocamlc.sh
@@ -224,5 +224,5 @@ compile driver/main.mli
 compile driver/main.ml
 #echo $COMPILER  -compat-32 -o ocamlc compilerlibs/ocamlcommon.$AEXT compilerlibs/ocamlbytecomp.$AEXT driver/main.$EXT
 #$COMPILER  -compat-32 -o ocamlc compilerlibs/ocamlcommon.$AEXT compilerlibs/ocamlbytecomp.$AEXT driver/main.$EXT
-echo $COMPILER -o ocamlc compilerlibs/ocamlcommon.$AEXT compilerlibs/ocamlbytecomp.$AEXT driver/main.$EXT -cclib "-lm -ldl -lpthread"
+echo $COMPILER -o ocamlc compilerlibs/ocamlcommon.$AEXT compilerlibs/ocamlbytecomp.$AEXT driver/main.$EXT -cclib '"-lm -ldl -lpthread"'
 $COMPILER -o ocamlc compilerlibs/ocamlcommon.$AEXT compilerlibs/ocamlbytecomp.$AEXT driver/main.$EXT -cclib "-lm -ldl -lpthread"