Compiler: fix jsoo link when use-js-string is disabled

Author: hhugo

compiler/lib/build_info.ml

@@ -132,3 +132,11 @@ let merge fname1 info1 fname2 info2 =
         | _, None, None -> assert false)
       info1
       info2
+
+let configure t =
+  StringMap.iter
+    (fun k v ->
+      match k with
+      | "use-js-string" | "effects" -> Config.Flag.set k (bool_of_string v)
+      | _ -> ())
+    t

compiler/lib/build_info.mli

@@ -44,3 +44,5 @@ exception
 val merge : string -> t -> string -> t -> t
 
 val kind : t -> kind
+
+val configure : t -> unit

compiler/lib/link_js.ml

@@ -356,29 +356,31 @@ let link ~output ~linkall ~files ~resolve_sourcemap_url ~source_map =
         match build_info_for_file with
         | Some bi -> (
             match Build_info.kind bi with
-            | `Runtime -> true
-            | `Cma | `Exe | `Cmo | `Unknown -> false)
-        | None -> false
+            | `Runtime -> Some bi
+            | `Cma | `Exe | `Cmo | `Unknown -> None)
+        | None -> None
       in
-      if is_runtime
-      then (
-        let primitives =
-          List.fold_left units ~init:[] ~f:(fun acc (u : Unit_info.t) ->
-              acc @ u.primitives)
-        in
-        let code = Parse_bytecode.link_info ~symtable:!sym ~primitives ~crcs:[] in
-        let b = Buffer.create 100 in
-        let fmt = Pretty_print.to_buffer b in
-        Driver.configure fmt;
-        Driver.f'
-          ~standalone:false
-          ~linkall:false
-          ~wrap_with_fun:`Iife
-          fmt
-          (Parse_bytecode.Debug.create ~include_cmis:false false)
-          code;
-        let content = Buffer.contents b in
-        String.split_on_char ~sep:'\n' content |> List.iter ~f:(Line_writer.write oc));
+      (match is_runtime with
+      | None -> ()
+      | Some bi ->
+          Build_info.configure bi;
+          let primitives =
+            List.fold_left units ~init:[] ~f:(fun acc (u : Unit_info.t) ->
+                acc @ u.primitives)
+          in
+          let code = Parse_bytecode.link_info ~symtable:!sym ~primitives ~crcs:[] in
+          let b = Buffer.create 100 in
+          let fmt = Pretty_print.to_buffer b in
+          Driver.configure fmt;
+          Driver.f'
+            ~standalone:false
+            ~linkall:false
+            ~wrap_with_fun:`Iife
+            fmt
+            (Parse_bytecode.Debug.create ~include_cmis:false false)
+            code;
+          let content = Buffer.contents b in
+          String.split_on_char ~sep:'\n' content |> List.iter ~f:(Line_writer.write oc));
       (match !sm_for_file with
       | None -> ()
       | Some x -> sm := (x, !reloc) :: !sm);