Merge PR #8415: [bin] Fix binary location procedure to work with symlinks.

1 files changed, 5 insertions, 2 deletions

diff --git a/lib/system.ml b/lib/system.ml
index eef65a4e3d..902a4f2506 100644
--- a/lib/system.ml
+++ b/lib/system.ml
@@ -301,8 +301,11 @@ let with_time ~batch f x =
     Feedback.msg_info (str msg ++ fmt_time_difference tstart tend ++ str msg2);
     raise e
 
+(* We use argv.[0] as we don't want to resolve symlinks *)
 let get_toplevel_path top =
-  let dir = Filename.dirname Sys.executable_name in
+  let open Filename in
+  let dir = if String.equal (basename Sys.argv.(0)) Sys.argv.(0)
+            then "" else dirname Sys.argv.(0) ^ dir_sep in
   let exe = if Sys.(os_type = "Win32" || os_type = "Cygwin") then ".exe" else "" in
   let eff = if Dynlink.is_native then ".opt" else ".byte" in
-  dir ^ Filename.dir_sep ^ top ^ eff ^ exe
+  dir ^ top ^ eff ^ exe