Small cleanup in the jsoo rules (#11125)

* Jsoo: avoid partial application * jsoo: match all fields Signed-off-by: Hugo Heuzard <[email protected]>
ocaml · Nov 16, 2024 · 3642425 · 3642425
1 parent fc61cbc
commit 3642425
Showing 1 changed file with 17 additions and 3 deletions.
diff --git a/src/dune_rules/jsoo/jsoo_rules.ml b/src/dune_rules/jsoo/jsoo_rules.ml
@@ -293,7 +293,7 @@ let jsoo_runtime_files ~(mode : Js_of_ocaml.Mode.t) libs =
       (Lib.info t))
 ;;
 
-let standalone_runtime_rule ~mode cc ~runtime_files ~target ~flags =
+let standalone_runtime_rule ~mode cc ~runtime_files ~target ~flags ~sourcemap =
   let dir = Compilation_context.dir cc in
   let sctx = Compilation_context.super_context cc in
   let config =
@@ -322,9 +322,20 @@ let standalone_runtime_rule ~mode cc ~runtime_files ~target ~flags =
     ~directory_targets:[]
     ~spec
     ~config:(Some config)
+    ~sourcemap
 ;;
 
-let exe_rule ~mode cc ~linkall ~runtime_files ~src ~target ~directory_targets ~flags =
+let exe_rule
+  ~mode
+  cc
+  ~linkall
+  ~runtime_files
+  ~src
+  ~target
+  ~directory_targets
+  ~flags
+  ~sourcemap
+  =
   let dir = Compilation_context.dir cc in
   let sctx = Compilation_context.super_context cc in
   let libs = Compilation_context.requires_link cc in
@@ -364,6 +375,7 @@ let exe_rule ~mode cc ~linkall ~runtime_files ~src ~target ~directory_targets ~f
     ~directory_targets
     ~flags
     ~config:None
+    ~sourcemap
 ;;
 
 let with_js_ext ~mode s =
@@ -406,6 +418,7 @@ let link_rule
   ~flags
   ~linkall
   ~link_time_code_gen
+  ~sourcemap
   =
   let sctx = Compilation_context.super_context cc in
   let dir = Compilation_context.dir cc in
@@ -475,6 +488,7 @@ let link_rule
     ~directory_targets
     ~flags
     ~config:None
+    ~sourcemap
 ;;
 
 let build_cm' sctx ~dir ~in_context ~mode ~src ~target ~config ~sourcemap =
@@ -629,7 +643,7 @@ let build_exe
   =
   let sctx = Compilation_context.super_context cc in
   let dir = Compilation_context.dir cc in
-  let { javascript_files; wasm_files; flags; compilation_mode; sourcemap; _ }
+  let { javascript_files; wasm_files; flags; compilation_mode; sourcemap; enabled_if = _ }
     : Js_of_ocaml.In_context.t
     =
     in_context