diff options
| author | Maxime Dénès | 2015-01-17 21:31:19 +0100 |
|---|---|---|
| committer | Maxime Dénès | 2015-01-17 21:31:19 +0100 |
| commit | 9e6b28c04ad98369a012faf3bd4d630cf123a473 (patch) | |
| tree | a906de91c8327085ee70909ff53e94bc29112560 | |
| parent | 715bd372596771cfe11ec441d098ce7defde8267 (diff) | |
| parent | eaa3d0b15adf4eb11ffb00ab087746a5b15c4d5d (diff) | |
Merge branch 'v8.5' into trunk
| -rw-r--r-- | kernel/safe_typing.ml | 4 | ||||
| -rw-r--r-- | library/library.ml | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/kernel/safe_typing.ml b/kernel/safe_typing.ml index 3a16bf806c..20cecc84a6 100644 --- a/kernel/safe_typing.ml +++ b/kernel/safe_typing.ml @@ -497,7 +497,9 @@ let add_modtype l params_mte inl senv = let full_add_module mb senv = let senv = add_constraints (Now mb.mod_constraints) senv in - { senv with env = Modops.add_module mb senv.env } + let dp = ModPath.dp mb.mod_mp in + let linkinfo = Nativecode.link_info_of_dirpath dp in + { senv with env = Modops.add_linked_module mb linkinfo senv.env } let full_add_module_type mp mt senv = let senv = add_constraints (Now mt.mod_constraints) senv in diff --git a/library/library.ml b/library/library.ml index 481d8707a9..b078e2c478 100644 --- a/library/library.ml +++ b/library/library.ml @@ -465,7 +465,6 @@ let rec_intern_by_filename_only id f = m.library_name, needed let native_name_from_filename f = - let _paths = Loadpath.get_paths () in let ch = System.with_magic_number_check raw_intern_library f in let (lmd : seg_lib), pos, digest_lmd = System.marshal_in_segment f ch in Nativecode.mod_uid_of_dirpath lmd.md_name |