fix(x-compilation): only install the context passed to -x

Signed-off-by: Antonio Nuno Monteiro <anmonteiro@gmail.com> Signed-off-by: Rudi Grinberg <me@rgrinberg.com>
ocaml · Mar 26, 2023 · 7533eb9 · 7533eb9
1 parent 203fe02
commit 7533eb9
Show file tree

Hide file tree

Showing 5 changed files with 50 additions and 14 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,6 +1,9 @@
 Unreleased
 ----------
 
+- Fix `dune install` when cross compiling (#7410, fixes #6191, @anmonteiro,
+  @rizo)
+
 - Dune in watch mode no longer builds concurrent rules in serial (#7395
   @rgrinberg, @jchavarri)
 

diff --git a/bin/common.ml b/bin/common.ml
@@ -911,6 +911,8 @@ let root t = t.root
 
 let watch t = t.builder.watch
 
+let x t = t.builder.workspace_config.x
+
 let print_metrics t = t.builder.print_metrics
 
 let dump_memo_graph_file t = t.builder.dump_memo_graph_file

diff --git a/bin/common.mli b/bin/common.mli
@@ -3,6 +3,8 @@ open Stdune
 
 type t
 
+val x : t -> Dune_engine.Context_name.t option
+
 val capture_outputs : t -> bool
 
 val root : t -> Workspace_root.t

diff --git a/bin/install_uninstall.ml b/bin/install_uninstall.ml
@@ -73,7 +73,7 @@ module Workspace = struct
        and+ contexts = Context.DB.all () in
        { packages = conf.packages; contexts })
 
-  let package_install_file t pkg =
+  let package_install_file t ~findlib_toolchain pkg =
     match Package.Name.Map.find t.packages pkg with
     | None -> Error ()
     | Some p ->
@@ -82,11 +82,11 @@ module Workspace = struct
       Ok
         (Path.Source.relative dir
            (Dune_rules.Install_rules.install_file ~package:name
-              ~findlib_toolchain:None))
+              ~findlib_toolchain))
 end
 
-let resolve_package_install workspace pkg =
-  match Workspace.package_install_file workspace pkg with
+let resolve_package_install workspace ~findlib_toolchain pkg =
+  match Workspace.package_install_file workspace ~findlib_toolchain pkg with
   | Ok path -> path
   | Error () ->
     let pkg = Package.Name.to_string pkg in
@@ -573,7 +573,19 @@ let install_uninstall ~what =
         let* workspace = Workspace.get () in
         let contexts =
           match context with
-          | None -> workspace.contexts
+          | None -> (
+            match Common.x common with
+            | Some findlib_toolchain ->
+              let contexts =
+                List.filter workspace.contexts ~f:(fun (ctx : Context.t) ->
+                    match ctx.findlib_toolchain with
+                    | None -> false
+                    | Some ctx_findlib_toolchain ->
+                      Dune_engine.Context_name.equal ctx_findlib_toolchain
+                        findlib_toolchain)
+              in
+              contexts
+            | None -> workspace.contexts)
           | Some name -> (
             match
               List.find workspace.contexts ~f:(fun c ->
@@ -599,9 +611,14 @@ let install_uninstall ~what =
         in
         let install_files, missing_install_files =
           List.concat_map pkgs ~f:(fun pkg ->
-              let fn = resolve_package_install workspace pkg in
               List.map contexts ~f:(fun (ctx : Context.t) ->
-                  let fn = Path.append_source (Path.build ctx.build_dir) fn in
+                  let fn =
+                    let fn =
+                      resolve_package_install workspace
+                        ~findlib_toolchain:ctx.findlib_toolchain pkg
+                    in
+                    Path.append_source (Path.build ctx.build_dir) fn
+                  in
                   if Path.exists fn then Left (ctx, (pkg, fn)) else Right fn))
           |> List.partition_map ~f:Fun.id
         in
@@ -755,7 +772,10 @@ let install_uninstall ~what =
                           Fiber.return entry)
                   in
                   if create_install_files then
-                    let fn = resolve_package_install workspace package in
+                    let fn =
+                      resolve_package_install workspace
+                        ~findlib_toolchain:context.findlib_toolchain package
+                    in
                     Io.write_file (Path.source fn)
                       (Install.gen_install_file entries)))
         in

diff --git a/test/blackbox-tests/test-cases/cross-compilation-install.t/run.t b/test/blackbox-tests/test-cases/cross-compilation-install.t/run.t
@@ -6,9 +6,18 @@ Installing a library with `-x foo` should install the library for that context
 
   $ dune build @install -x foo
 
-  $ dune install --dry-run --prefix prefix --display short -p repro -x foo
-  Error: The following <package>.install are missing:
-  - _build/default/repro.install
-  - _build/default.foo/repro.install
-  Hint: try running: dune build [-p <pkg>] @install
-  [1]
+  $ dune install --dry-run --prefix prefix --display short -p repro -x foo 2>&1 | grep "Installing"
+  Installing prefix/foo-sysroot/lib/repro/META
+  Installing prefix/foo-sysroot/lib/repro/dune-package
+  Installing prefix/foo-sysroot/lib/repro/foo.ml
+  Installing prefix/foo-sysroot/lib/repro/repro.a
+  Installing prefix/foo-sysroot/lib/repro/repro.cma
+  Installing prefix/foo-sysroot/lib/repro/repro.cmi
+  Installing prefix/foo-sysroot/lib/repro/repro.cmt
+  Installing prefix/foo-sysroot/lib/repro/repro.cmx
+  Installing prefix/foo-sysroot/lib/repro/repro.cmxa
+  Installing prefix/foo-sysroot/lib/repro/repro.ml
+  Installing prefix/foo-sysroot/lib/repro/repro__Foo.cmi
+  Installing prefix/foo-sysroot/lib/repro/repro__Foo.cmt
+  Installing prefix/foo-sysroot/lib/repro/repro__Foo.cmx
+  Installing prefix/foo-sysroot/lib/repro/repro.cmxs