diff --git a/CHANGES.md b/CHANGES.md index 32094b7d75a4..43acdeb377fe 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -15,6 +15,9 @@ Unreleased - Fix `dune-package` installation when META templates are present (#3743, fixes #3746, @rgrinberg) +- Fix `ppx.exe` being compiled for the wrong target when cross-compiling + (#3698, @toots) + 2.7.0 (13/08/2020) ------------------ diff --git a/src/dune_rules/preprocessing.ml b/src/dune_rules/preprocessing.ml index 0c330358b85a..cec687c8af24 100644 --- a/src/dune_rules/preprocessing.ml +++ b/src/dune_rules/preprocessing.ml @@ -395,6 +395,9 @@ let gen_rules sctx components = let ppx_driver_exe sctx libs = let key = Digest.to_string (Key.Decoded.of_libs libs |> Key.encode) in + (* Make sure to compile ppx.exe for the compiling host. + See: #2252, #2286 and #3698 *) + let sctx = SC.host sctx in ppx_exe sctx ~key let get_cookies ~loc ~expander ~lib_name libs =