diff options
| author | Fabrice Le Fessant <Fabrice.Le_fessant@inria.fr> | 2013-06-12 13:33:43 +0000 |
|---|---|---|
| committer | Fabrice Le Fessant <Fabrice.Le_fessant@inria.fr> | 2013-06-12 13:33:43 +0000 |
| commit | aa53c7c59d498894d5129a06495ffdf25d9b8e76 (patch) | |
| tree | 627b8943b355eabeaaa20afcee55cb2c466ac6fd | |
| parent | 5d82e6f17f27e239df053acce2961a9d030e612d (diff) | |
Fix ocamlnat compilation
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13770 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
| -rw-r--r-- | toplevel/opttoploop.ml | 8 | ||||
| -rw-r--r-- | toplevel/opttopmain.ml | 3 |
2 files changed, 6 insertions, 5 deletions
diff --git a/toplevel/opttoploop.ml b/toplevel/opttoploop.ml index cc1dcf1c9..e547bbd4d 100644 --- a/toplevel/opttoploop.ml +++ b/toplevel/opttoploop.ml @@ -382,7 +382,7 @@ let refill_lexbuf buffer len = let _ = Sys.interactive := true; Dynlink.init (); - Optcompile.init_path(); + Compmisc.init_path true; Clflags.dlcode := true; () @@ -407,7 +407,7 @@ let set_paths () = () let initialize_toplevel_env () = - toplevel_env := Optcompile.initial_env() + toplevel_env := Compmisc.initial_env() (* The interactive loop *) @@ -447,7 +447,7 @@ let run_script ppf name args = Array.blit args 0 Sys.argv 0 len; Obj.truncate (Obj.repr Sys.argv) len; Arg.current := 0; - Optcompile.init_path(); - toplevel_env := Optcompile.initial_env(); + Compmisc.init_path true; + toplevel_env := Compmisc.initial_env(); Sys.interactive := false; use_silently ppf name diff --git a/toplevel/opttopmain.ml b/toplevel/opttopmain.ml index 0217709bc..968014c2d 100644 --- a/toplevel/opttopmain.ml +++ b/toplevel/opttopmain.ml @@ -74,7 +74,7 @@ module Options = Main_args.Make_opttop_options (struct let _noprompt = set noprompt let _nopromptcont = set nopromptcont let _nostdlib = set no_std_include - let _ppx s = ppx := s :: !ppx + let _ppx s = Compenv.first_ppx := s :: !Compenv.first_ppx let _principal = set principal let _real_paths = set real_paths let _rectypes = set recursive_types @@ -87,6 +87,7 @@ module Options = Main_args.Make_opttop_options (struct let _w s = Warnings.parse_options false s let _warn_error s = Warnings.parse_options true s let _warn_help = Warnings.help_warnings + let _short_paths = clear real_paths let _dsource = set dump_source let _dparsetree = set dump_parsetree |