Skip to content

Commit

Permalink
Small gains in internal inference
Browse files Browse the repository at this point in the history
These changes don't affect anything that "leaks out" but they make some
internal calls better.
  • Loading branch information
timholy committed Dec 23, 2020
1 parent 637828c commit 033714d
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/runtime.jl
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ Return the library paths that e.g. libjulia and such are stored in.
"""
function get_julia_libpaths()
if isempty(JULIA_LIBDIRS)
append!(JULIA_LIBDIRS, [joinpath(Sys.BINDIR, Base.LIBDIR, "julia"), joinpath(Sys.BINDIR, Base.LIBDIR)])
append!(JULIA_LIBDIRS, [joinpath(Sys.BINDIR::String, Base.LIBDIR, "julia"), joinpath(Sys.BINDIR::String, Base.LIBDIR)])
# Windows needs to see the BINDIR as well
@static if Sys.iswindows()
push!(JULIA_LIBDIRS, Sys.BINDIR)
Expand Down
2 changes: 1 addition & 1 deletion src/wrapper_generators.jl
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,6 @@ macro generate_init_footer()
unique!(PATH_list)
unique!(LIBPATH_list)
PATH[] = join(PATH_list, $(pathsep))
LIBPATH[] = join(vcat(LIBPATH_list, Base.invokelatest(JLLWrappers.get_julia_libpaths)), $(pathsep))
LIBPATH[] = join(vcat(LIBPATH_list, Base.invokelatest(JLLWrappers.get_julia_libpaths))::Vector{String}, $(pathsep))
end)
end

0 comments on commit 033714d

Please sign in to comment.