Add dependency on dune path to action

Signed-off-by: Marek Kubica <marek@tarides.com>

Author: Leonidas-from-XIV

src/dune_rules/pkg_rules.ml

@@ -986,12 +986,14 @@ module Action_expander = struct
                | Path p | Dir p -> Path p))
          in
          let ocamlfind_destdir = (Lazy.force expander.paths.install_roots).lib_root in
+         let dune_exe = Path.of_string Sys.executable_name in
          Run_with_path.action
            ~depexts
            ~pkg:(expander.name, prog_loc)
            exe
            args
-           ~ocamlfind_destdir)
+           ~ocamlfind_destdir
+           ~dune_exe)
     | Progn t ->
       let+ args = Memo.parallel_map t ~f:(expand ~expander) in
       Action.Progn args
@@ -1143,15 +1145,33 @@ module Action_expander = struct
 
   let sandbox = Sandbox_mode.Set.singleton Sandbox_mode.copy
 
+  let rec action_contains_run action =
+    match (action : Dune_lang.Action.t) with
+    | Run _ -> true
+    | Progn actions -> actions |> List.find ~f:action_contains_run |> Option.is_some
+    | When (_, action) -> action_contains_run action
+    | Withenv (_, action) -> action_contains_run action
+    | _ -> false
+  ;;
+
   let expand context (pkg : Pkg.t) action =
+    let depend_on_dune =
+      match action_contains_run action with
+      | false -> Action_builder.return ()
+      | true ->
+        Path.External.of_string Sys.executable_name
+        |> Path.external_
+        |> Action_builder.path
+    in
     let+ action =
       let expander = expander context pkg in
       expand action ~expander >>| Action.chdir pkg.paths.source_dir
     in
     (* TODO copying is needed for build systems that aren't dune and those
        with an explicit install step *)
-    Action.Full.make ~sandbox action
-    |> Action_builder.return
+    let open Action_builder.O in
+    depend_on_dune
+    >>> (Action.Full.make ~sandbox action |> Action_builder.return)
     |> Action_builder.with_no_targets
   ;;
 

src/dune_rules/run_with_path.ml

@@ -84,6 +84,7 @@ module Spec = struct
     { prog : ('path, Action.Prog.Not_found.t) result
     ; args : 'path arg Array.Immutable.t
     ; ocamlfind_destdir : 'path
+    ; dune_exe : 'path
     ; pkg : Dune_pkg.Package_name.t * Loc.t
     ; depexts : string list
     }
@@ -101,13 +102,16 @@ module Spec = struct
     { t with
       args = Array.Immutable.map t.args ~f:(map_arg ~f)
     ; ocamlfind_destdir = f t.ocamlfind_destdir
+    ; dune_exe = f t.dune_exe
     ; prog = Result.map t.prog ~f
     }
   ;;
 
   let is_useful_to ~memoize:_ = true
 
-  let encode { prog; args; ocamlfind_destdir; pkg = _; depexts = _ } path _ : Sexp.t =
+  let encode { prog; args; ocamlfind_destdir; dune_exe; pkg = _; depexts = _ } path _
+    : Sexp.t
+    =
     let prog : Sexp.t =
       match prog with
       | Ok p -> path p
@@ -120,11 +124,11 @@ module Spec = struct
              | String s -> Sexp.Atom s
              | Path p -> path p)))
     in
-    List [ List ([ prog ] @ args); path ocamlfind_destdir ]
+    List [ List ([ prog ] @ args); path ocamlfind_destdir; path dune_exe ]
   ;;
 
   let action
-        { prog; args; ocamlfind_destdir; pkg; depexts }
+        { prog; args; ocamlfind_destdir; dune_exe; pkg; depexts }
         ~(ectx : Action.context)
         ~(eenv : Action.env)
     =
@@ -144,8 +148,7 @@ module Spec = struct
       let dune_folder =
         let bin_folder = Temp.create Dir ~prefix:"dune" ~suffix:"self-in-path" in
         let dst = Path.relative bin_folder "dune" in
-        let src = Path.of_string Sys.executable_name in
-        Io.portable_symlink ~src ~dst;
+        Io.portable_symlink ~src:dune_exe ~dst;
         Path.to_string bin_folder
       in
       let env =
@@ -188,6 +191,6 @@ end
 
 module A = Action_ext.Make (Spec)
 
-let action ~pkg ~depexts prog args ~ocamlfind_destdir =
-  A.action { Spec.prog; args; ocamlfind_destdir; pkg; depexts }
+let action ~pkg ~depexts prog args ~ocamlfind_destdir ~dune_exe =
+  A.action { Spec.prog; args; ocamlfind_destdir; dune_exe; pkg; depexts }
 ;;

src/dune_rules/run_with_path.mli

@@ -20,4 +20,5 @@ val action
   -> Action.Prog.t
   -> Path.t Spec.arg Array.Immutable.t
   -> ocamlfind_destdir:Path.t
+  -> dune_exe:Path.t
   -> Action.t