do not force libs to early

Signed-off-by: Hugo Heuzard <[email protected]>
ocaml · Nov 4, 2021 · 174c75e · 174c75e
1 parent e78a438
commit 174c75e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/src/dune_rules/jsoo_rules.ml b/src/dune_rules/jsoo_rules.ml
@@ -90,14 +90,16 @@ let link_rule cc ~runtime ~target cm ~flags ~link_time_code_gen =
   let ctx = Compilation_context.context cc in
   let dir = Compilation_context.dir cc in
   let requires = Compilation_context.requires_link cc in
-  let* special_units =
-    let+ pre = link_time_code_gen in
-    List.concat_map pre ~f:(function
-      | `Mod path -> [ Path.extend_basename ~suffix:".js" path ]
-      | `Lib _ -> [])
+  let special_units =
+    Action_builder.memo_build
+      (let+ pre = link_time_code_gen in
+       List.concat_map pre ~f:(function
+         | `Mod path -> [ Path.extend_basename ~suffix:".js" path ]
+         | `Lib _ -> []))
   in
   let get_all =
-    Action_builder.map cm ~f:(fun cm ->
+    Action_builder.map (Action_builder.both cm special_units)
+      ~f:(fun (cm, special_units) ->
         Resolve.Build.args
           (let open Resolve.Build.O in
           let+ libs = requires in

diff --git a/test/blackbox-tests/test-cases/enabled_if/eif-simple.t/dune b/test/blackbox-tests/test-cases/enabled_if/eif-simple.t/dune
@@ -41,4 +41,4 @@
 
 (rule (with-stdout-to main.ml (echo "")))
 
-(executable (name main) (libraries baz))
+(executable (name main) (modes native js) (libraries baz))
Original file line number	Diff line number	Diff line change
Expand Up		@@ -41,4 +41,4 @@

		(rule (with-stdout-to main.ml (echo "")))

		(executable (name main) (libraries baz))
		(executable (name main) (modes native js) (libraries baz))