Merge pull request #3588 from mtzguido/misc

Passing -thread in --ocamlc/--ocamlopt
FStarLang · Oct 21, 2024 · 06f57e0 · 06f57e0
2 parents adc24f9 + 7b34266
commit 06f57e0
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 10 deletions.
diff --git a/ocaml/fstar-lib/generated/FStarC_OCaml.ml b/ocaml/fstar-lib/generated/FStarC_OCaml.ml
diff --git a/src/fstar/FStarC.OCaml.fst b/src/fstar/FStarC.OCaml.fst
@@ -16,6 +16,7 @@
 module FStarC.OCaml
 
 open FStarC
+open FStar.List.Tot.Base
 open FStarC.Compiler
 open FStarC.Compiler.Effect
 
@@ -45,18 +46,26 @@ let exec_in_ocamlenv #a (cmd : string) (args : list string) : a =
   Util.execvp cmd (cmd :: args);
   failwith "execvp failed"
 
+let app_lib = "fstar.lib"
+let plugin_lib = "fstar.lib"
+
 (* OCaml Warning 8: this pattern-matching is not exhaustive.
 This is usually benign as we check for exhaustivenss via SMT. *)
+let wstr = "-8"
+
+let common_args =
+  "-w" :: wstr ::
+  "-thread" ::
+  []
 
 let exec_ocamlc args =
   exec_in_ocamlenv "ocamlfind"
-    ("c" :: "-w" :: "-8" :: "-linkpkg" :: "-package" :: "fstar.lib" :: args)
+    ("c" :: common_args @ "-linkpkg" :: "-package" :: app_lib :: args)
 
 let exec_ocamlopt args =
   exec_in_ocamlenv "ocamlfind"
-    ("opt" :: "-w" :: "-8" :: "-linkpkg" :: "-package" :: "fstar.lib" :: args)
+    ("opt" :: common_args @ "-linkpkg" :: "-package" :: app_lib :: args)
 
 let exec_ocamlopt_plugin args =
   exec_in_ocamlenv "ocamlfind"
-    ("opt" :: "-w" :: "-8" :: "-shared" :: "-package" :: "fstar.lib" ::
-    args)
+    ("opt" :: common_args @ "-shared" :: "-package" :: plugin_lib :: args)