aboutsummaryrefslogtreecommitdiffhomepage
path: root/library/library.ml
diff options
context:
space:
mode:
authorGravatar Guillaume Melquiond <guillaume.melquiond@inria.fr>2014-03-07 16:38:59 +0100
committerGravatar Guillaume Melquiond <guillaume.melquiond@inria.fr>2014-03-07 16:38:59 +0100
commitd692c5dc034778a1d97ace593c9a3658a44e698b (patch)
tree7b66e9e5056660511a7a3d73efa4eea2fda24eba /library/library.ml
parentb80cf566a39efe65f5ef0b1cc4ff9bb295a67fc7 (diff)
Fix lookup of native files when option -R is missing.
Testcase: mkdir a echo "Definition t := O." > a/a.v coqc -R a a a/a.v echo "Require Import a.a. Definition u := t." > b.v coqc -I . b.v rm -rf a b.*
Diffstat (limited to 'library/library.ml')
-rw-r--r--library/library.ml8
1 files changed, 2 insertions, 6 deletions
diff --git a/library/library.ml b/library/library.ml
index 64c2c2ad5..a1760cdf1 100644
--- a/library/library.ml
+++ b/library/library.ml
@@ -754,9 +754,7 @@ let save_library_to ?todo dir f =
close_out ch;
(* Writing native code files *)
if not !Flags.no_native_compiler then
- let lp = Loadpath.get_load_paths () in
- let map_path p = CUnix.string_of_physical_path (Loadpath.physical p) in
- let lp = List.map map_path lp in
+ let lp = Loadpath.get_accessible_paths () in
let fn = Filename.dirname f'^"/"^Nativecode.mod_uid_of_dirpath dir in
if not (Int.equal (Nativelibrary.compile_library dir ast lp fn) 0) then
msg_error (str"Could not compile the library to native code. Skipping.")
@@ -788,8 +786,6 @@ let mem s =
(CObj.size_kb m.library_objects)))
let get_load_paths_str () =
- let lp = Loadpath.get_load_paths () in
- let map_path p = CUnix.string_of_physical_path (Loadpath.physical p) in
- List.map map_path lp
+ List.map CUnix.string_of_physical_path (Loadpath.get_accessible_paths ())
let _ = Nativelib.get_load_paths := get_load_paths_str