diff options
author | Enrico Tassi <Enrico.Tassi@inria.fr> | 2016-06-14 12:56:03 +0200 |
---|---|---|
committer | Enrico Tassi <Enrico.Tassi@inria.fr> | 2016-06-14 12:56:03 +0200 |
commit | a1eeb3abe387a89cd5a9108160643b6157f9c0af (patch) | |
tree | e17a2b20e8c44126912acdf601124386349f3f89 /library/library.ml | |
parent | ee08817e76f91cc67ba9d2ea8f79218e413e21b4 (diff) | |
parent | c046c30e11d1658d5580c157ebb0d3e6d70fb4e4 (diff) |
Merge remote-tracking branch 'origin/pr/166' into trunk
Add -o option to coqc
Diffstat (limited to 'library/library.ml')
-rw-r--r-- | library/library.ml | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/library/library.ml b/library/library.ml index 4d0082850..bc7723f48 100644 --- a/library/library.ml +++ b/library/library.ml @@ -628,17 +628,14 @@ let check_module_name s = done | c -> err c -let start_library f = - let () = if not (Sys.file_exists f) then - errorlabstrm "" (hov 0 (str "Can't find file" ++ spc () ++ str f)) - in +let start_library fo = let ldir0 = try - let lp = Loadpath.find_load_path (Filename.dirname f) in + let lp = Loadpath.find_load_path (Filename.dirname fo) in Loadpath.logical lp with Not_found -> Nameops.default_root_prefix in - let file = Filename.chop_extension (Filename.basename f) in + let file = Filename.chop_extension (Filename.basename fo) in let id = Id.of_string file in check_module_name file; check_coq_overwriting ldir0 id; @@ -693,12 +690,13 @@ let error_recursively_dependent_library dir = writing the content and computing the checksum... *) let save_library_to ?todo dir f otab = - let f, except = match todo with + let except = match todo with | None -> assert(!Flags.compilation_mode = Flags.BuildVo); - f ^ "o", Future.UUIDSet.empty + assert(Filename.check_suffix f ".vo"); + Future.UUIDSet.empty | Some (l,_) -> - f ^ "io", + assert(Filename.check_suffix f ".vio"); List.fold_left (fun e (r,_) -> Future.UUIDSet.add r.Stateid.uuid e) Future.UUIDSet.empty l in let cenv, seg, ast = Declaremods.end_library ~except dir in |