From d643abd6bc67ed6fb3064316cdca19d5f1564418 Mon Sep 17 00:00:00 2001
From: Emilio Jesus Gallego Arias
Date: Wed, 20 Dec 2017 11:11:13 +0100
Subject: [build] Fix VM dynamic linking prep in byte builds.

We correctly set the path of `libcoqrun` in non-local builds. This bug
was introduced by #6038.

c.f. #6475 , #5992.
---
 Makefile.build | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/Makefile.build b/Makefile.build
index f0dd46b0fa..dc988e885e 100644
--- a/Makefile.build
+++ b/Makefile.build
@@ -406,17 +406,16 @@ $(COQTOPEXE): $(COQTOPBYTE)
 	cp $< $@
 endif
 
-# Are "-cclib lcoqrun -dllib -lcoqrun" necessary?
+# VMBYTEFLAGS will either contain -custom of the right -dllpath for the VM
 $(COQTOPBYTE): $(LINKCMO) $(LIBCOQRUN) $(TOPLOOPCMA) $(COQTOP_BYTE_MLTOP)
 	$(SHOW)'COQMKTOP -o $@'
 	$(HIDE)$(OCAMLC) -linkall -linkpkg -I toplevel \
-	                 -I kernel/byterun -dllpath $(abspath kernel/byterun) -cclib -lcoqrun -dllib -lcoqrun \
+	                 -I kernel/byterun/ -cclib -lcoqrun $(VMBYTEFLAGS) \
                          $(SYSMOD) -package camlp5.gramlib,compiler-libs.toplevel \
 	                 $(LINKCMO) $(BYTEFLAGS) \
 	                 $(COQTOP_BYTE_MLTOP) toplevel/coqtop_bin.ml -o $@
 
-# coqc
-
+# For coqc
 COQCCMO:=clib/clib.cma lib/lib.cma toplevel/usage.cmo tools/coqc.cmo
 
 $(COQC): $(call bestobj, $(COQCCMO))
-- 
cgit v1.2.3