Skip to content

Commit c396349

Browse files
committed
Use JULIA_PKGDIR for caching
1 parent 370af84 commit c396349

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

base/client.jl

+1-1
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,7 @@ function init_load_path()
332332
end
333333
push!(LOAD_PATH,abspath(JULIA_HOME,"..","local","share","julia","site",vers))
334334
push!(LOAD_PATH,abspath(JULIA_HOME,"..","share","julia","site",vers))
335-
push!(LOAD_CACHE_PATH,abspath(homedir(),".julia","lib",vers))
335+
push!(LOAD_CACHE_PATH,abspath(Pkg.Dir._pkgroot(),"lib",vers))
336336
push!(LOAD_CACHE_PATH,abspath(JULIA_HOME,"..","usr","lib","julia")) #TODO: fixme
337337
end
338338

base/loading.jl

+2-1
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,8 @@ function create_expr_cache(input::AbstractString, output::AbstractString)
229229
--output-ji $output --output-incremental=yes
230230
--startup-file=no --history-file=no
231231
--eval $code_object`,
232-
["JULIA_HOME=$JULIA_HOME", "HOME=$(homedir())"])), "w", STDOUT)
232+
["JULIA_HOME=$JULIA_HOME", "HOME=$(homedir())",
233+
"JULIA_PKGDIR=$(Pkg.dir())"])), "w", STDOUT)
233234
serialize(io, quote
234235
empty!(Base.LOAD_PATH)
235236
append!(Base.LOAD_PATH, $LOAD_PATH)

0 commit comments

Comments
 (0)