aboutsummaryrefslogtreecommitdiff
path: root/toplevel
diff options
context:
space:
mode:
authorMaxime Dénès2017-06-12 15:41:20 +0200
committerMaxime Dénès2017-06-12 16:43:32 +0200
commitba079418c3ffbfa0d852a8bc73fd9d258e6da4ef (patch)
treea63209cfbec52b4ba6a014702470bb19d06a82af /toplevel
parent102d7418e399de646b069924277e4baea1badaca (diff)
parent8443867a2f944c3ecaf0b0b826368c29935a21e1 (diff)
Merge PR#707: add support for "-bypass-API" argument to "coq_makefile"
Diffstat (limited to 'toplevel')
-rw-r--r--toplevel/coqinit.ml2
-rw-r--r--toplevel/coqtop.ml2
2 files changed, 2 insertions, 2 deletions
diff --git a/toplevel/coqinit.ml b/toplevel/coqinit.ml
index 8fca302687..16fe405551 100644
--- a/toplevel/coqinit.ml
+++ b/toplevel/coqinit.ml
@@ -124,7 +124,7 @@ let init_ocaml_path () =
Mltop.add_ml_dir (List.fold_left (/) Envars.coqroot [dl])
in
Mltop.add_ml_dir (Envars.coqlib ());
- List.iter add_subdir Envars.coq_src_subdirs
+ List.iter add_subdir Coq_config.all_src_dirs
let get_compat_version = function
| "8.7" -> Flags.Current
diff --git a/toplevel/coqtop.ml b/toplevel/coqtop.ml
index 26ee413fb0..31450ebd51 100644
--- a/toplevel/coqtop.ml
+++ b/toplevel/coqtop.ml
@@ -621,7 +621,7 @@ let init_toplevel arglist =
Spawned.init_channels ();
Envars.set_coqlib ~fail:(fun msg -> CErrors.user_err Pp.(str msg));
if !print_where then (print_endline(Envars.coqlib ()); exit(exitcode ()));
- if !print_config then (Envars.print_config stdout; exit (exitcode ()));
+ if !print_config then (Envars.print_config stdout Coq_config.all_src_dirs; exit (exitcode ()));
if !print_tags then (print_style_tags (); exit (exitcode ()));
if !filter_opts then (print_string (String.concat "\n" extras); exit 0);
init_load_path ();