fix2

esy · Oct 22, 2020 · ee51fca · ee51fca
1 parent 9cf5b89
commit ee51fca
Show file tree

Hide file tree

Showing 18 changed files with 448 additions and 342 deletions.
diff --git a/esy.lock/index.json b/esy.lock/index.json
diff --git a/esy.lock/opam/base.v0.13.2/opam b/esy.lock/opam/base.v0.13.2/opam
diff --git a/esy.lock/opam/csexp.1.3.1/opam → esy.lock/opam/csexp.1.3.2/opam b/esy.lock/opam/csexp.1.3.1/opam → esy.lock/opam/csexp.1.3.2/opam
diff --git a/esy.lock/opam/dot-merlin-reader.3.4.1/opam b/esy.lock/opam/dot-merlin-reader.3.4.1/opam
diff --git a/esy.lock/opam/dune-build-info.2.7.0/opam → esy.lock/opam/dune-build-info.2.7.1/opam b/esy.lock/opam/dune-build-info.2.7.0/opam → esy.lock/opam/dune-build-info.2.7.1/opam
diff --git a/esy.lock/opam/dune-configurator.2.7.0/opam → esy.lock/opam/dune-configurator.2.7.1/opam b/esy.lock/opam/dune-configurator.2.7.0/opam → esy.lock/opam/dune-configurator.2.7.1/opam
diff --git a/esy.lock/opam/dune.2.7.0/opam → esy.lock/opam/dune.2.7.1/opam b/esy.lock/opam/dune.2.7.0/opam → esy.lock/opam/dune.2.7.1/opam
diff --git a/esy.lock/opam/fmt.0.8.8/opam → esy.lock/opam/fmt.0.8.9/opam b/esy.lock/opam/fmt.0.8.8/opam → esy.lock/opam/fmt.0.8.9/opam
diff --git a/esy.lock/opam/fpath.0.7.2/opam b/esy.lock/opam/fpath.0.7.2/opam
diff --git a/esy.lock/opam/fpath.0.7.3/opam b/esy.lock/opam/fpath.0.7.3/opam
diff --git a/esy.lock/opam/merlin.3.3.9/opam → esy.lock/opam/merlin.3.4.1/opam b/esy.lock/opam/merlin.3.3.9/opam → esy.lock/opam/merlin.3.4.1/opam
diff --git a/esy.lock/opam/topkg.1.0.2/opam → esy.lock/opam/topkg.1.0.3/opam b/esy.lock/opam/topkg.1.0.2/opam → esy.lock/opam/topkg.1.0.3/opam
diff --git a/esy.lock/overrides/opam__s__dune_opam__c__2.7.0_opam_override/package.json b/esy.lock/overrides/opam__s__dune_opam__c__2.7.0_opam_override/package.json
diff --git a/esy.lock/overrides/opam__s__dune_opam__c__2.7.1_opam_override/files/build.sh b/esy.lock/overrides/opam__s__dune_opam__c__2.7.1_opam_override/files/build.sh
diff --git a/esy.lock/overrides/opam__s__dune_opam__c__2.7.1_opam_override/package.json b/esy.lock/overrides/opam__s__dune_opam__c__2.7.1_opam_override/package.json
diff --git a/lib/Executable.re b/lib/Executable.re
@@ -160,18 +160,19 @@ let toDuneStanza = (common: Common.t, e) => {
               Some(
                 List([
                   Atom("ocamlopt_flags"),
-                  List(rest @ [Atom("-ccopt"), Atom("-static")]),
+                  ...(rest @ [List([Atom("-ccopt"), Atom("-static")])]),
                 ])
                 |> Stanza.ofSexp,
               )
             | [] =>
               Some(
                 List([
                   Atom("ocamlopt_flags"),
-                  List(l @ [Atom("-ccopt"), Atom("-static")]),
+                  List([Atom("-ccopt"), Atom("-static")]),
                 ])
                 |> Stanza.ofSexp,
               )
+            | _ => failwith("Invalid s-exp obtained for ocamlopt_flags")
             }
           | _ =>
             Some(
@@ -184,7 +185,7 @@ let toDuneStanza = (common: Common.t, e) => {
           }
         }
       )
-    | Some(static) when !static => ocamloptFlags
+    | Some(_) => ocamloptFlags
     | None => ocamloptFlags
     };
 

diff --git a/lib/Lib.re b/lib/Lib.re
@@ -206,4 +206,4 @@ let duneEject = (projectPath, manifestFile, subpackageNameOrPath) => {
     );
     write(Path.(pesyPackage.pkg_path / "dune"), DuneFile.toString(duneFile));
   };
-};
+};