Merge pull request #25 from JuliaPackaging/teh/inference

Small gains in internal inference
JuliaPackaging · Dec 23, 2020 · 6bb050b · 6bb050b
2 parents 637828c + 033714d
commit 6bb050b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/runtime.jl b/src/runtime.jl
@@ -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)

diff --git a/src/wrapper_generators.jl b/src/wrapper_generators.jl
@@ -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