Skip to content

Commit 3135260

Browse files
authored
use the correct path to include Compiler.jl in release builds (JuliaLang#56601)
JuliaLang#56409 broke PackageCompiler (or other use cases where you want to compile a new core compiler from a release build) since it hardcoded the relative path `../usr/` from Base to the `shared` directory but this is not true in releases where it is at `..`.
1 parent 58c2153 commit 3135260

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/Compiler.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,14 +87,14 @@ eval(m, x) = Core.eval(m, x)
8787
function include(x::String)
8888
if !isdefined(Base, :end_base_include)
8989
# During bootstrap, all includes are relative to `base/`
90-
x = Base.strcat(Base.strcat(Base.BUILDROOT, "../usr/share/julia/Compiler/src/"), x)
90+
x = Base.strcat(Base.strcat(Base.DATAROOT, "julia/Compiler/src/"), x)
9191
end
9292
Base.include(Compiler, x)
9393
end
9494

9595
function include(mod::Module, x::String)
9696
if !isdefined(Base, :end_base_include)
97-
x = Base.strcat(Base.strcat(Base.BUILDROOT, "../usr/share/julia/Compiler/src/"), x)
97+
x = Base.strcat(Base.strcat(Base.DATAROOT, "julia/Compiler/src/"), x)
9898
end
9999
Base.include(mod, x)
100100
end

0 commit comments

Comments
 (0)