From 4a96baf41965249c77b390dd252e8fa36b806c5f Mon Sep 17 00:00:00 2001
From: Maxime Dénès
Date: Sat, 17 Jan 2015 20:35:43 +0100
Subject: Fix #3379, now that Require inside modules is allowed again.

---
 kernel/safe_typing.ml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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
-- 
cgit v1.2.3


From eaa3d0b15adf4eb11ffb00ab087746a5b15c4d5d Mon Sep 17 00:00:00 2001
From: Maxime Dénès
Date: Sat, 17 Jan 2015 20:38:46 +0100
Subject: Remove dead code.

Follow-up on Matthieu's d030ce0721.
---
 library/library.ml | 1 -
 1 file changed, 1 deletion(-)

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
-- 
cgit v1.2.3