Fix target for ppx.exe

ocaml · Nov 12, 2020 · 4e5a6a1 · 4e5a6a1
1 parent 5e03523
commit 4e5a6a1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -72,6 +72,9 @@ Unreleased
 - instrumentations backends can now receive arguments via `(instrumentation
   (backend <name> <args>))`. (#3906, #3932, @nojb)
 
+- Fix `ppx.exe` being compiled for the wrong target when cross-compiling
+  (#3698, @toots)
+
 2.7.1 (2/09/2020)
 -----------------
 

diff --git a/src/dune_rules/preprocessing.ml b/src/dune_rules/preprocessing.ml
@@ -384,6 +384,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 =