From 9b15fea21f9c1afe2690461b1955618302723af8 Mon Sep 17 00:00:00 2001 From: Kristoffer Date: Fri, 21 Mar 2025 12:18:30 +0100 Subject: [PATCH] Use upstream functionality for fixing stdlib paths This allows us to automatically get new functionality like https://github.com/JuliaLang/julia/pull/57274. --- src/utils.jl | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/src/utils.jl b/src/utils.jl index bd1c641..184fdb9 100644 --- a/src/utils.jl +++ b/src/utils.jl @@ -310,28 +310,7 @@ function maybe_fix_path(file) file = normpath(newfile) end end - return maybe_fixup_stdlib_path(file) -end - -safe_isfile(x) = try isfile(x); catch; false end -const BUILDBOT_STDLIB_PATH = dirname(abspath(String((@which uuid1()).file), "..", "..", "..")) -replace_buildbot_stdlibpath(str::String) = replace(str, BUILDBOT_STDLIB_PATH => Sys.STDLIB) -""" - path = maybe_fixup_stdlib_path(path::String) - -Return `path` corrected for julia issue [#26314](https://github.com/JuliaLang/julia/issues/26314) if applicable. -Otherwise, return the input `path` unchanged. - -Due to the issue mentioned above, location info for methods defined one of Julia's standard libraries -are, for non source Julia builds, given as absolute paths on the worker that built the `julia` executable. -This function corrects such a path to instead refer to the local path on the users drive. -""" -function maybe_fixup_stdlib_path(path) - if !safe_isfile(path) - maybe_stdlib_path = replace_buildbot_stdlibpath(path) - safe_isfile(maybe_stdlib_path) && return maybe_stdlib_path - end - return path + return Base.fixup_stdlib_path(file) end function postpath(filename, pre)