diff options
author | Jacques Garrigue <garrigue at math.nagoya-u.ac.jp> | 2013-01-29 14:21:12 +0000 |
---|---|---|
committer | Jacques Garrigue <garrigue at math.nagoya-u.ac.jp> | 2013-01-29 14:21:12 +0000 |
commit | 26e1ff7138c3e90e845fb278fc6283a166f1871f (patch) | |
tree | d02a34c8baf030ed23102619fe541c888f85bf76 /tools/ocamloptp.ml | |
parent | d327f16c33093540f99738cf195d51b736f5581c (diff) | |
parent | 1430e90e89240309b1aea3a7ddd0270bb16707b8 (diff) | |
download | ocaml-26e1ff7138c3e90e845fb278fc6283a166f1871f.tar.gz |
Merge short-paths into a fresh branch of trunk.short-paths-4.01
Also fix a bit unification and subtyping errors.
You now need the flag -short-path to activate short paths.
git-svn-id: http://caml.inria.fr/svn/ocaml/branches/short-paths-4.01@13285 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'tools/ocamloptp.ml')
-rw-r--r-- | tools/ocamloptp.ml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/ocamloptp.ml b/tools/ocamloptp.ml index 3f6f77cb6a..74d1314aca 100644 --- a/tools/ocamloptp.ml +++ b/tools/ocamloptp.ml @@ -76,6 +76,7 @@ module Options = Main_args.Make_optcomp_options (struct let _pp s = incompatible "-pp" let _ppx s = incompatible "-ppx" let _principal = option "-principal" + let _short_paths = option "-short-paths" let _rectypes = option "-rectypes" let _runtime_variant s = option_with_arg "-runtime-variant" s let _S = option "-S" |