[coq] Better adaptation to new camlp5 version.
Jerry James
jjames at fedoraproject.org
Thu Jun 14 22:57:08 UTC 2012
commit 513be4d9af4122628afa825c50ead8b9ba1c7042
Author: Jerry James <loganjerry at gmail.com>
Date: Thu Jun 14 16:55:48 2012 -0600
Better adaptation to new camlp5 version.
coq-camlp5.patch | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
---
diff --git a/coq-camlp5.patch b/coq-camlp5.patch
index 4b3fed6..f1ddc78 100644
--- a/coq-camlp5.patch
+++ b/coq-camlp5.patch
@@ -1,11 +1,11 @@
---- ./scripts/coqmktop.ml.orig 2011-11-06 04:59:10.000000000 -0700
-+++ ./scripts/coqmktop.ml 2012-06-13 17:18:45.386268250 -0600
-@@ -33,7 +33,7 @@ let ide = split_list Tolink.ide
- (* 3. Toplevel objects *)
- let camlp4topobjs =
- if Coq_config.camlp4 = "camlp5" then
-- ["camlp5_top.cma"; "pa_o.cmo"; "pa_extend.cmo"]
-+ ["camlp5_top.cma"; "camlp5o.cma"; "pa_o.cmo"; "pa_extend.cmo"]
- else
- ["camlp4_top.cma"; "pa_o.cmo"; "pa_op.cmo"; "pa_extend.cmo"]
- let topobjs = camlp4topobjs
+--- scripts/coqmktop.ml.orig 2011-11-06 04:59:10.000000000 -0700
++++ scripts/coqmktop.ml 2012-06-14 15:32:08.307676865 -0600
+@@ -274,7 +274,7 @@
+ ocamloptexec^" -linkall"
+ end else
+ (* bytecode (we shunt ocamlmktop script which fails on win32) *)
+- let ocamlmktoplib = " toplevellib.cma" in
++ let ocamlmktoplib = " -I +compiler-libs ocamlcommon.cma ocamlbytecomp.cma ocamltoplevel.cma" in
+ let ocamlcexec = Filename.concat camlbin "ocamlc" in
+ let ocamlccustom = Printf.sprintf "%s %s -linkall "
+ ocamlcexec Coq_config.coqrunbyteflags in
More information about the scm-commits
mailing list