diff options
author | Bernhard Schommer <bernhardschommer@gmail.com> | 2015-01-12 14:20:31 +0100 |
---|---|---|
committer | Bernhard Schommer <bernhardschommer@gmail.com> | 2015-01-12 14:20:31 +0100 |
commit | 81e91f965e7b1afbea8d1630015e75f11f0a3afd (patch) | |
tree | 270a85299f33d783e33745c917796f080f7300e1 /myocamlbuild.ml | |
parent | 3304820b870e4524c7d1f14fcd62506634f7922b (diff) | |
parent | 06841a5bb7ca27bc436e87e7991d0d05dbf5267c (diff) | |
download | compcert-81e91f965e7b1afbea8d1630015e75f11f0a3afd.tar.gz compcert-81e91f965e7b1afbea8d1630015e75f11f0a3afd.zip |
Merge branch 'master' into dwarf
Conflicts:
powerpc/PrintAsm.ml
Diffstat (limited to 'myocamlbuild.ml')
-rw-r--r-- | myocamlbuild.ml | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/myocamlbuild.ml b/myocamlbuild.ml deleted file mode 100644 index ef286185..00000000 --- a/myocamlbuild.ml +++ /dev/null @@ -1,14 +0,0 @@ -open Ocamlbuild_plugin;; -dispatch begin function -| After_rules -> - flag ["ocaml"; "parser"; "menhir"] (A("--explain")); - - (* libraries and syntax extensions accessed via ocamlfind *) - 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,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 |