diff options
| author | Pierre-Marie Pédrot | 2018-10-02 15:34:04 +0200 |
|---|---|---|
| committer | Pierre-Marie Pédrot | 2018-10-02 15:34:04 +0200 |
| commit | e65d160d5fa4e0b8b5754b0925b0b5a880523bc5 (patch) | |
| tree | 21600f3e1fbb6fb82ccf941d6f4246968eb541d6 /kernel | |
| parent | 5424ad236574e22a7ef2dce0d1d9468a9b768a16 (diff) | |
| parent | 8c40e6eb7f5bd2421ed6a22a0b44490f3d1fb9ef (diff) | |
Merge PR #8572: [config] Miscellaneous cleaning of configuration variables.
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/nativelib.ml | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/kernel/nativelib.ml b/kernel/nativelib.ml index 6edb387bb1..d294f2060e 100644 --- a/kernel/nativelib.ml +++ b/kernel/nativelib.ml @@ -11,7 +11,6 @@ open Util open Nativevalues open Nativecode open CErrors -open Envars (** This file provides facilities to access OCaml compiler and dynamic linker, used by the native compiler. *) @@ -37,7 +36,7 @@ let ( / ) = Filename.concat (* We have to delay evaluation of include_dirs because coqlib cannot be guessed until flags have been properly initialized *) let include_dirs () = - [Filename.get_temp_dir_name (); coqlib () / "kernel"; coqlib () / "library"] + [Filename.get_temp_dir_name (); Envars.coqlib () / "kernel"; Envars.coqlib () / "library"] (* Pointer to the function linking an ML object into coq's toplevel *) let load_obj = ref (fun _x -> () : string -> unit) @@ -99,9 +98,9 @@ let call_compiler ?profile:(profile=false) ml_filename = ::"-w"::"a" ::include_dirs) @ ["-impl"; ml_filename] in - if !Flags.debug then Feedback.msg_debug (Pp.str (ocamlfind () ^ " " ^ (String.concat " " args))); + if !Flags.debug then Feedback.msg_debug (Pp.str (Envars.ocamlfind () ^ " " ^ (String.concat " " args))); try - let res = CUnix.sys_command (ocamlfind ()) args in + let res = CUnix.sys_command (Envars.ocamlfind ()) args in let res = match res with | Unix.WEXITED 0 -> true | Unix.WEXITED _n | Unix.WSIGNALED _n | Unix.WSTOPPED _n -> |