From e82710fe58e7e2f38a9fde6fa5d40515de6e9e23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20Dimino?= Date: Mon, 16 Mar 2020 15:24:22 +0000 Subject: [PATCH] Fix #3262 (#3269) Signed-off-by: Jeremie Dimino --- CHANGES.md | 10 ++++++++-- src/dune/workspace.ml | 8 +++++--- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index be079d4801c..ddb54eac950 100644 --- 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 index 4506314976d..b91b6c55a35 100644 --- 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