diff options
| author |  Maxime Dénès <mail@maximedenes.fr> | 2018-02-19 10:04:57 +0100 |
|---|---|---|
| committer | Maxime Dénès <mail@maximedenes.fr> | 2018-02-19 10:04:57 +0100 |
| commit | 2a47eae1c4556a34ecf91a27f756e299dfe18a98 (patch) | |
| tree | 793b77bb87f23e04694bd777851756a6d9ff4bef | |
| parent | 2c50a583ca270e43ced828f44dd3d38811accab9 (diff) | |
| parent | d643abd6bc67ed6fb3064316cdca19d5f1564418 (diff) | |
Merge PR #6478: [build] Fix VM dynamic linking prep in byte builds.
| -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)) |