From b8ccfeb0cfe11c4eb6168f177e96d2796ae199dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9goire=20Henry?= <gregoire.henry@ocamlpro.com>
Date: Wed, 2 Aug 2017 15:39:10 +0200
Subject: [PATCH] Makefile: fix `utop` rules

---
 src/Makefile        | 4 ++--
 src/Makefile.config | 2 ++
 src/Makefile.files  | 1 +
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index 093e5900c..124aa16a4 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -138,7 +138,7 @@ utils.top: DEVFLAGS=
 utils.top:
 	( $(patsubst %, echo "#require \"%\";;" ; ,${UTILS_PACKAGES}) ) > .ocamlinit.utils
 	( $(patsubst %, echo "#mod_use \"%\";;" ; ,${MINUTILS_LIB_IMPLS} ${UTILS_LIB_IMPLS}) ) >> .ocamlinit.utils
-	utop -init .ocamlinit.utils ${OCAMLFLAGS}
+	utop -init .ocamlinit.utils ${UTOPFLAGS}
 
 ############################################################################
 ## Node protocol compiler (also embedded in the main program)
@@ -200,7 +200,7 @@ node.top: ${MINUTILS_LIB_IMPLS} ${UTILS_LIB_IMPLS} ${COMPILER_LIB_IMPLS} ${FULL_
 	( $(patsubst %, echo "#mod_use \"%\";;" ; ,${MINUTILS_LIB_IMPLS} ${UTILS_LIB_IMPLS}) ) >> .ocamlinit.node
 	( $(patsubst %, echo "open %;;" ; ,Error_monad Hash Utils) ) >> .ocamlinit.node
 	( $(patsubst %, echo "#mod_use \"%\";;" ; ,${COMPILER_LIB_IMPLS} ${FULL_NODE_LIB_IMPLS}) ) >> .ocamlinit.node
-	utop -init .ocamlinit.node ${OCAMLFLAGS}
+	utop -init .ocamlinit.node ${UTOPFLAGS}
 
 clean::
 	rm -f ${TZNODE}
diff --git a/src/Makefile.config b/src/Makefile.config
index cda9daa10..c7ae9a27f 100644
--- a/src/Makefile.config
+++ b/src/Makefile.config
@@ -17,6 +17,8 @@ OCAMLFLAGS = \
   ${INCLUDES} \
   ${EXTRA_OCAMLFLAGS}
 
+UTOPFLAGS = $(filter-out -thread,${OCAMLFLAGS})
+
 OCAMLC = ocamlfind ocamlc
 OCAMLOPT = ocamlfind ocamlopt
 OCAMLMKTOP = ocamlfind ocamlmktop
diff --git a/src/Makefile.files b/src/Makefile.files
index 7a7bf9d21..72d438fe9 100644
--- a/src/Makefile.files
+++ b/src/Makefile.files
@@ -171,6 +171,7 @@ COMPILER_IMPLS := \
 
 COMPILER_PACKAGES := \
   ${UTILS_PACKAGES} \
+  compiler-libs \
   compiler-libs.optcomp \
   lwt.unix \
   ocplib-endian \