diff options
| author |  Emilio Jesus Gallego Arias <e+git@x80.org> | 2017-12-20 11:11:13 +0100 |
|---|---|---|
| committer | Emilio Jesus Gallego Arias <e+git@x80.org> | 2018-02-14 00:39:17 +0100 |
| commit | d643abd6bc67ed6fb3064316cdca19d5f1564418 (patch) | |
| tree | 285da23f0e442b0f917dab1215934837e1d9d0db /Makefile.build | |
| parent | 52d666a7a83e4023d9f5cd7324ed81c7f7926156 (diff) | |
[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.
Diffstat (limited to 'Makefile.build')
| -rw-r--r-- | Makefile.build | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Makefile.build b/Makefile.build index f0dd46b0f..dc988e885 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)) |