diff options
| -rw-r--r-- | kernel/nativelib.ml | 8 | ||||
| -rw-r--r-- | library/library.ml | 3 |
2 files changed, 9 insertions, 2 deletions
diff --git a/kernel/nativelib.ml b/kernel/nativelib.ml index 09202f6a7..46125a2c7 100644 --- a/kernel/nativelib.ml +++ b/kernel/nativelib.ml @@ -77,15 +77,21 @@ let compile ml_filename code = write_ml_code ml_filename code; call_compiler ml_filename (!get_load_paths()) +(* call_linker dynamic links code for constants in environment or a *) +(* conversion test. Silently fails if the file does not exist in bytecode *) +(* mode, since the standard library is not compiled to bytecode with default *) +(* settings. *) let call_linker ~fatal prefix f upds = rt1 := dummy_value (); rt2 := dummy_value (); + if Dynlink.is_native || Sys.file_exists f then (try if Dynlink.is_native then Dynlink.loadfile f else !load_obj f; register_native_file prefix with | Dynlink.Error e -> let msg = "Dynlink error, " ^ Dynlink.error_message e in if fatal then anomaly (Pp.str msg) else Pp.msg_warning (Pp.str msg) - | _ -> let msg = "Dynlink error" in + | _ -> + let msg = "Dynlink error" in if fatal then anomaly (Pp.str msg) else Pp.msg_warning (Pp.str msg)); match upds with Some upds -> update_locations upds | _ -> () diff --git a/library/library.ml b/library/library.ml index 92104348e..9938333f2 100644 --- a/library/library.ml +++ b/library/library.ml @@ -222,7 +222,8 @@ let register_loaded_library m = let prefix = Nativecode.mod_uid_of_dirpath m.library_name ^ "." in let f = prefix ^ "cmo" in let f = Dynlink.adapt_filename f in - Nativelib.call_linker ~fatal:false prefix (Filename.concat dirname f) None + if not !Flags.no_native_compiler then + Nativelib.call_linker ~fatal:false prefix (Filename.concat dirname f) None in let rec aux = function | [] -> link m; [m] |