aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Emilio Jesus Gallego Arias <e+git@x80.org>2017-03-09 01:09:50 +0100
committerGravatar Emilio Jesus Gallego Arias <e+git@x80.org>2017-03-10 16:23:07 +0100
commitd201ccad094feda44a4d232de936df57c33f22f2 (patch)
treef0d99eae7e805377f79ec2a2d1b9b3b8a1a351a0
parentccb706774a8f9bf4f58f6899a58e6cc5117901a6 (diff)
[META] [build] Install dlls to kernel/byterun
This makes the dll path consistent both in `-local` and non-local Coq install.
-rw-r--r--META.coq15
-rw-r--r--Makefile.install5
-rw-r--r--configure.ml2
3 files changed, 9 insertions, 13 deletions
diff --git a/META.coq b/META.coq
index 5084237e8..83134d4a0 100644
--- a/META.coq
+++ b/META.coq
@@ -43,21 +43,16 @@ package "lib" (
package "vm" (
description = "Coq VM"
-
version = "8.7"
-# dllpath is dependent on the type of Coq install. In a local one
-# we'll want kernel/byterun, in a non-local one we want to set it to
-# coqlib. We should thus generate this file at configure time, but
-# let's hear for some more feedback from experts.
+ directory = "kernel/byterun"
-# Enable for local native & byte builds
-# directory = "kernel/byterun"
+# We should generate this file at configure time for local byte builds
+# to work properly.
-# Enable for local byte builds and set up properly
-# linkopts(byte) = "-dllpath /path/to/coq/kernel/byterun/ -dllib -lcoqrun"
+# Enable this setting for local byte builds, disabling the one below.
+# linkopts(byte) = "-dllpath path_to_coq/kernel/byterun/ -dllib -lcoqrun"
-# Disable for local byte builds
linkopts(byte) = "-dllib -lcoqrun"
linkopts(native) = "-cclib -lcoqrun"
diff --git a/Makefile.install b/Makefile.install
index 4800ea0b9..bde035551 100644
--- a/Makefile.install
+++ b/Makefile.install
@@ -104,11 +104,12 @@ install-library:
$(MKDIR) $(FULLCOQLIB)
$(INSTALLSH) $(FULLCOQLIB) $(LIBFILES) $(PLUGINS)
$(MKDIR) $(FULLCOQLIB)/user-contrib
+ $(MKDIR) $(FULLCOQLIB)/kernel/byterun
ifndef CUSTOM
- $(INSTALLLIB) $(DLLCOQRUN) $(FULLCOQLIB)
+ $(INSTALLLIB) $(DLLCOQRUN) $(FULLCOQLIB)/kernel/byterun
endif
ifeq ($(BEST),opt)
- $(INSTALLLIB) $(LIBCOQRUN) $(FULLCOQLIB)
+ $(INSTALLLIB) $(LIBCOQRUN) $(FULLCOQLIB)/kernel/byterun
$(INSTALLSH) $(FULLCOQLIB) $(PLUGINSOPT)
endif
# csdpcert is not meant to be directly called by the user; we install
diff --git a/configure.ml b/configure.ml
index e71136751..82ce931d6 100644
--- a/configure.ml
+++ b/configure.ml
@@ -926,7 +926,7 @@ let config_runtime () =
| _ ->
let ld="CAML_LD_LIBRARY_PATH" in
build_loadpath := sprintf "export %s:='%s/kernel/byterun':$(%s)" ld coqtop ld;
- ["-dllib";"-lcoqrun";"-dllpath";libdir]
+ ["-dllib";"-lcoqrun";"-dllpath";libdir/"kernel/byterun"]
let vmbyteflags = config_runtime ()