Use JULIA_PKGDIR for caching

JuliaLang · Jul 22, 2015 · c396349 · c396349
1 parent 370af84
commit c396349
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/base/client.jl b/base/client.jl
@@ -332,7 +332,7 @@ function init_load_path()
     end
     push!(LOAD_PATH,abspath(JULIA_HOME,"..","local","share","julia","site",vers))
     push!(LOAD_PATH,abspath(JULIA_HOME,"..","share","julia","site",vers))
-    push!(LOAD_CACHE_PATH,abspath(homedir(),".julia","lib",vers))
+    push!(LOAD_CACHE_PATH,abspath(Pkg.Dir._pkgroot(),"lib",vers))
     push!(LOAD_CACHE_PATH,abspath(JULIA_HOME,"..","usr","lib","julia")) #TODO: fixme
 end
 

diff --git a/base/loading.jl b/base/loading.jl
@@ -229,7 +229,8 @@ function create_expr_cache(input::AbstractString, output::AbstractString)
             --output-ji $output --output-incremental=yes
             --startup-file=no --history-file=no
             --eval $code_object`,
-        ["JULIA_HOME=$JULIA_HOME", "HOME=$(homedir())"])), "w", STDOUT)
+        ["JULIA_HOME=$JULIA_HOME", "HOME=$(homedir())",
+         "JULIA_PKGDIR=$(Pkg.dir())"])), "w", STDOUT)
     serialize(io, quote
         empty!(Base.LOAD_PATH)
         append!(Base.LOAD_PATH, $LOAD_PATH)