diff options
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/nativelib.ml | 5 | ||||
| -rw-r--r-- | kernel/safe_typing.ml | 2 | ||||
| -rw-r--r-- | kernel/safe_typing.mli | 1 |
3 files changed, 7 insertions, 1 deletions
diff --git a/kernel/nativelib.ml b/kernel/nativelib.ml index 605c1225c7..29b6bf6de7 100644 --- a/kernel/nativelib.ml +++ b/kernel/nativelib.ml @@ -94,7 +94,10 @@ let compile_library dir code fn = let basename = Filename.basename fn in let dirname = Filename.dirname fn in let dirname = dirname / output_dir in - if not (Sys.file_exists dirname) then Unix.mkdir dirname 0o755; + let () = + try Unix.mkdir dirname 0o755 + with Unix.Unix_error (Unix.EEXIST, _, _) -> () + in let fn = dirname / basename in write_ml_code fn ~header code; let r = fst (call_compiler fn) in diff --git a/kernel/safe_typing.ml b/kernel/safe_typing.ml index d6bd754783..d9adca0c91 100644 --- a/kernel/safe_typing.ml +++ b/kernel/safe_typing.ml @@ -246,6 +246,8 @@ let join_safe_environment ?(except=Future.UUIDSet.empty) e = else add_constraints (Now (Future.join fc)) e) {e with future_cst = []} e.future_cst +let is_joined_environment e = List.is_empty e.future_cst + (** {6 Various checks } *) let exists_modlabel l senv = Label.Set.mem l senv.modlabels diff --git a/kernel/safe_typing.mli b/kernel/safe_typing.mli index abd5cd7ae1..a57fb108c4 100644 --- a/kernel/safe_typing.mli +++ b/kernel/safe_typing.mli @@ -51,6 +51,7 @@ val is_curmod_library : safe_environment -> bool val join_safe_environment : ?except:Future.UUIDSet.t -> safe_environment -> safe_environment +val is_joined_environment : safe_environment -> bool (** {6 Enriching a safe environment } *) (** Insertion of local declarations (Local or Variables) *) |