Fix #3262 (#3269)

Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
ocaml · Mar 16, 2020 · e82710f · e82710f · corwin-of-amber · Mar 17, 2020
1 parent bf5f954
commit e82710f
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,10 +1,16 @@
-next (unreleased)
------------------
+2.5.0 (unreleased)
+------------------
 
 - Add a `--release` option meaning the same as `-p` but without the
   package filtering. This is useful for custom `dune` invocation in opam
   files where we don't want `-p` (#3260, @diml)
 
+2.4.1 (unreleased)
+------------------
+
+- Fix a bug introduced in 2.4.0 causing `.bc` programs to be built
+  with `-custom` by default (#3269, fixes #3262, @diml)
+
 2.4.0 (06/03/2020)
 ------------------
 

diff --git a/src/dune/workspace.ml b/src/dune/workspace.ml
@@ -96,9 +96,11 @@ module Context = struct
         field_o "toolchain"
           (Dune_lang.Syntax.since syntax (1, 5) >>> Context_name.decode)
       and+ dynamically_linked_foreign_archives =
-        field ~default:false "disable_dynamically_linked_foreign_archives"
-          (let+ disable = Dune_lang.Syntax.since syntax (2, 0) >>> bool in
-           not disable)
+        let+ disable =
+          field ~default:false "disable_dynamically_linked_foreign_archives"
+            (Dune_lang.Syntax.since syntax (2, 0) >>> bool)
+        in
+        not disable
       and+ fdo_target_exe =
         let f file =
           let ext = Filename.extension file in