Permalink
Browse files

[fix] bslloading: Reactivate compositionality, needed by extrapath (n…

…ative)
  • Loading branch information...
1 parent 8db1c2a commit af30b15a9821db4293390a2d0a372fdb0225f966 @BourgerieQuentin BourgerieQuentin committed Sep 4, 2012
Showing with 17 additions and 17 deletions.
  1. +17 −17 compiler/opa/pass_BslLoading.ml
@@ -311,23 +311,23 @@ let process
let search_path = cwd :: ObjectFiles.get_paths () in
(* Separated compilation: loading *)
- (* let () = *)
- (* let iter (package_name, _) entries = *)
- (* let iter_entry entry = *)
- (* let { S.plugin_name = basename ; extralib ; extrapath ; bypass } = resolve_entry search_path entry in *)
- (* if not (Hashtbl.mem already_seen_plugin basename) *)
- (* then ( *)
- (* BslLib.declare_visibility package_name basename ; *)
- (* Hashtbl.add already_seen_plugin basename basename ; *)
- (* Hashtbl.add extralib_plugin basename extralib ; *)
- (* Hashtbl.add extrapath_plugin basename extrapath ; *)
- (* BslDynlink.load_bypass_plugin_cache (BslDynlink.MarshalPlugin bypass) ; *)
- (* ) *)
- (* in *)
- (* List.iter iter_entry entries *)
- (* in *)
- (* R.iter_with_name ~packages:true ~deep:false iter *)
- (* in *)
+ let () =
+ let iter (package_name, _) entries =
+ let iter_entry entry =
+ let { S.plugin_name = basename ; extralib ; extrapath ; bypass } = resolve_entry search_path entry in
+ if not (Hashtbl.mem already_seen_plugin basename)
+ then (
+ BslLib.declare_visibility package_name basename ;
+ Hashtbl.add already_seen_plugin basename basename ;
+ Hashtbl.add extralib_plugin basename extralib ;
+ Hashtbl.add extrapath_plugin basename extrapath ;
+ BslDynlink.load_bypass_plugin_cache (BslDynlink.MarshalPlugin bypass) ;
+ )
+ in
+ List.iter iter_entry entries
+ in
+ R.iter_with_name ~packages:true ~deep:false iter
+ in
let separation = Separation.create () in
let commandline = FilePos.nopos "command line" in

0 comments on commit af30b15

Please sign in to comment.