pass LOAD_PATH to precompile/build/test children (fix #27993) (#28039)

JuliaLang · Jul 10, 2018 · 3791357 · 3791357 · nanosoldier · Jul 11, 2018
1 parent 90bdc77
commit 3791357
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/base/loading.jl b/base/loading.jl
@@ -1078,8 +1078,13 @@ function load_path_setup_code(load_path::Bool=true)
     append!(empty!(Base.DL_LOAD_PATH), $(repr(map(abspath, DL_LOAD_PATH))))
     """
     if load_path
+        load_path = map(abspath, Base.load_path())
+        path_sep = Sys.iswindows() ? ';' : ':'
+        any(path -> path_sep in path, load_path) &&
+            error("LOAD_PATH entries cannot contain $(repr(path_sep))")
         code *= """
-        append!(empty!(Base.LOAD_PATH), $(repr(map(abspath, Base.load_path()))))
+        append!(empty!(Base.LOAD_PATH), $(repr(load_path)))
+        ENV["JULIA_LOAD_PATH"] = $(repr(join(load_path, Sys.iswindows() ? ';' : ':')))
         Base.HOME_PROJECT[] = Base.ACTIVE_PROJECT[] = nothing
         """
     end
@@ -1104,7 +1109,6 @@ function create_expr_cache(input::String, output::String, concrete_deps::typeof(
     try
         write(in, """
         begin
-        import OldPkg
         $(Base.load_path_setup_code())
         Base._track_dependencies[] = true
         empty!(Base._concrete_dependencies)

diff --git a/stdlib/Pkg/src/API.jl b/stdlib/Pkg/src/API.jl
@@ -475,7 +475,6 @@ function precompile(ctx::Context)
     code = join(["import " * pkg for pkg in needs_to_be_precompiled], '\n') * "\nexit(0)"
     for (i, pkg) in enumerate(needs_to_be_precompiled)
         code = """
-            import OldPkg
             $(Base.load_path_setup_code())
             import $pkg
         """