define DL_LOAD_PATH earlier (fixes #3838)

JuliaLang · Jul 30, 2013 · 27451c8 · 27451c8
1 parent dc6389e
commit 27451c8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/base/client.jl b/base/client.jl
@@ -288,9 +288,6 @@ isinteractive() = (is_interactive::Bool)
 
 function init_load_path()
  vers = "v$(VERSION.major).$(VERSION.minor)"
- global const DL_LOAD_PATH = ByteString[]
- @osx_only push!(DL_LOAD_PATH, "@executable_path/../lib")
- @osx_only push!(DL_LOAD_PATH, "@executable_path/../lib/julia")
  global const LOAD_PATH = ByteString[
  abspath(JULIA_HOME,"..","local","share","julia","site",vers),
  abspath(JULIA_HOME,"..","share","julia","site",vers)

diff --git a/base/sysimg.jl b/base/sysimg.jl
@@ -83,6 +83,10 @@ include("inference.jl")
 # For OS sprcific stuff in I/O
 include("osutils.jl")
 
+const DL_LOAD_PATH = ByteString[]
+@osx_only push!(DL_LOAD_PATH, "@executable_path/../lib/julia")
+@osx_only push!(DL_LOAD_PATH, "@executable_path/../lib")
+
 # strings & printing
 include("char.jl")
 include("ascii.jl")