From befbc76f89f3d8abc8da17caf91ea4a87ec96eeb Mon Sep 17 00:00:00 2001 From: xleroy Date: Wed, 28 Mar 2012 13:32:21 +0000 Subject: checklink: first import of Valentin Robert's validator for asm and link cparser: renamed Errors to Cerrors; removed packing into Cparser. git-svn-id: https://yquem.inria.fr/compcert/svn/compcert/trunk@1856 fca1b0fc-160b-0410-b1d3-a4f43f01ea2e --- myocamlbuild.ml | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'myocamlbuild.ml') diff --git a/myocamlbuild.ml b/myocamlbuild.ml index 41b4cfc1..c1b3ca8b 100644 --- a/myocamlbuild.ml +++ b/myocamlbuild.ml @@ -2,16 +2,23 @@ open Ocamlbuild_plugin;; dispatch begin function | After_rules -> (* declare the tags "use_Cparser" and "include_Cparser" *) - ocaml_lib "cfrontend/Cparser"; + ocaml_lib "cparser/Cparser"; (* force linking of libCparser.a when use_Cparser is set *) flag ["link"; "ocaml"; "native"; "use_Cparser"] - (S[A"cfrontend/libCparser.a"]); + (S[A"cparser/libCparser.a"]); flag ["link"; "ocaml"; "byte"; "use_Cparser"] - (S[A"-custom"; A"cfrontend/libCparser.a"]); + (S[A"-custom"; A"cparser/libCparser.a"]); (* make sure libCparser.a is up to date *) - dep ["link"; "ocaml"; "use_Cparser"] ["cfrontend/libCparser.a"]; + dep ["link"; "ocaml"; "use_Cparser"] ["cparser/libCparser.a"]; + + (* ocamlfind libraries *) + flag ["ocaml"; "link"; "pkg_unix"] & S[A"-package"; A "unix"]; + flag ["ocaml"; "link"; "pkg_str"] & S[A"-package"; A "str"]; + flag ["ocaml"; "compile"; "pkg_bitstring"] & S[A"-package"; A"bitstring,bitstring.syntax"; A"-syntax"; A"bitstring.syntax"; A"-syntax"; A"camlp4o"]; + flag ["ocaml"; "ocamldep"; "pkg_bitstring"] & S[A"-package"; A"bitstring,bitstring.syntax"; A"-syntax"; A"bitstring.syntax,camlp4o"]; + flag ["ocaml"; "link"; "pkg_bitstring"] & S[A"-package"; A"bitstring"] | _ -> () end -- cgit