Rewrite absolute external paths into relative paths

Signed-off-by: Marek Kubica <[email protected]>

Author: Leonidas-from-XIV

src/dune_pkg/lock_dir.ml

@@ -1787,18 +1787,9 @@ let loc_in_source_tree loc =
   loc
   |> Loc.map_pos ~f:(fun ({ pos_fname; _ } as pos) ->
     let path = Path.of_string pos_fname in
-    match path with
-    | External _ | In_source_tree _ -> pos
-    | In_build_dir b ->
-      (match Path.Build.explode b with
-       | ".dev-tools.locks" :: _ ->
-         (* we're excluding the hidden dev-tools.locks folders in the build folder
-          from rewriting  *)
-         pos
-       | _otherwise ->
-         let new_path = in_source_tree path in
-         let pos_fname = Path.Source.to_string new_path in
-         { pos with pos_fname }))
+    let new_path = in_source_tree path in
+    let pos_fname = Path.Source.to_string new_path in
+    { pos with pos_fname })
 ;;
 
 let check_if_solved_for_platform { solved_for_platforms; _ } ~platform =

test/blackbox-tests/test-cases/pkg/ocamlformat/ocamlformat-dev-tool-fails-to-build.t

@@ -15,7 +15,7 @@ It fails during the build because of missing OCamlFormat module.
   $ DUNE_CONFIG__LOCK_DEV_TOOL=enabled dune fmt
   Solution for _build/.dev-tools.locks/ocamlformat:
   - ocamlformat.0.26.4
-  File "$TESTCASE_ROOT/_build/.dev-tools.locks/ocamlformat/ocamlformat.pkg", line 4, characters 6-10:
+  File "_build/.dev-tools.locks/ocamlformat/ocamlformat.pkg", line 4, characters 6-10:
   4 |  (run dune build -p %{pkg-self:name} @install))
             ^^^^
   Error: Logs for package ocamlformat
@@ -24,9 +24,4 @@ It fails during the build because of missing OCamlFormat module.
                     ^^^^^^^^^^^
   Error: Module "Ocamlformat" doesn't exist.
 
-  -> required by
-     _build/_private/default/.dev-tool/ocamlformat/target/bin/ocamlformat
-  -> required by _build/default/.formatted/foo.ml
-  -> required by alias .formatted/fmt
-  -> required by alias fmt
   [1]