From 35b56076eda878684cdefddabe833d33fdff604d Mon Sep 17 00:00:00 2001 From: glondu Date: Fri, 7 Oct 2011 09:47:07 +0000 Subject: ocamlbuild: Fix ocamlbuild compilation for changes to configure from r14500. The changes to myocamlbuild.ml didn't compile. See bug #2614. Signed-off-by: Tom Prince Signed-off-by: Stephane Glondu git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@14518 85f007b7-540e-0410-9357-904b9bb8a0f7 --- myocamlbuild.ml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/myocamlbuild.ml b/myocamlbuild.ml index 6ffd3e2a55..c6e2cf0185 100644 --- a/myocamlbuild.ml +++ b/myocamlbuild.ml @@ -261,14 +261,12 @@ let extra_rules () = begin let lines = read_file "config/coq_config.ml" in let lines = List.map (fun s -> s^"\n") lines in let line0 = "\n(* Adapted variables for ocamlbuild *)\n" in - let line2 = "let coqlib = None\n" in - (* TODO : line3 isn't completely accurate with respect to ./configure: + (* TODO : line2 isn't completely accurate with respect to ./configure: the case of -local -coqrunbyteflags foo isn't supported *) - let line3 = - "let coqrunbyteflags = \"-dllib -lcoqrun -dllpath '" - ^srcbuild^"/kernel/byterun'\"\n" + let line1 = + "let coqrunbyteflags = \"-dllib -lcoqrun -dllpath 'kernel/byterun'\"\n" in - Echo (lines @ [line0;line1] @ (if local then [line2;line3] else []), + Echo (lines @ (if local then [line0;line1] else []), "coq_config.ml")); (** Camlp4 extensions *) -- cgit v1.2.3