fix(cross): expand artifacts in the right context

Fixes #9199 Signed-off-by: Etienne Millon <[email protected]>
ocaml · Nov 16, 2023 · 68723da · 68723da
1 parent 5176356
commit 68723da
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/dune_rules/expander.ml b/src/dune_rules/expander.ml
@@ -332,8 +332,12 @@ let expand_lib_variable t source ~lib ~file ~lib_exec ~lib_private =
                     |> String.quoted)
              ])
     else (
-      let artifacts = if lib_exec then t.lib_artifacts_host else t.lib_artifacts in
-      file_of_lib artifacts (Context.host t.context) ~loc ~lib ~file)
+      let artifacts, context =
+        if lib_exec
+        then t.lib_artifacts_host, Context.host t.context
+        else t.lib_artifacts, t.context
+      in
+      file_of_lib artifacts context ~loc ~lib ~file)
   in
   let p =
     let open Memo.O in

diff --git a/test/blackbox-tests/test-cases/github9199.t b/test/blackbox-tests/test-cases/github9199.t
@@ -34,4 +34,4 @@ See #9199.
   $ cat _build/host/target
   ../install/host/lib/somelib/somelib.a
   $ cat _build/cross/target
-  ../install/host/lib/somelib/somelib.a
+  ../install/cross/lib/somelib/somelib.a