Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
KristofferC committed Nov 20, 2024
1 parent a6fc64c commit 09ee30b
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions src/PackageCompiler.jl
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,9 @@ function create_fresh_base_sysimage(stdlibs::Vector{String}; cpu_target::String,

@static if VERSION >= v"1.12.0-DEV.1617"
compiler_source_path = joinpath(base_dir, "Base_compiler.jl")
compiler_args = `./` # build path
buildroot = ""
dataroot = relpath(joinpath(Sys.BINDIR, Base.DATAROOTDIR), base_dir) * "/"
compiler_args = `--buildroot $buildroot --dataroot $dataroot` # build path
else
compiler_source_path = joinpath(base_dir, "compiler", "compiler.jl")
compiler_args = ``
Expand All @@ -255,7 +257,7 @@ function create_fresh_base_sysimage(stdlibs::Vector{String}; cpu_target::String,
$compiler_source_path $compiler_args`
@debug "running $cmd"

read(cmd)
run(cmd)
end

spinner = TerminalSpinners.Spinner(msg = "PackageCompiler: compiling fresh sysimage (incremental=false)")
Expand All @@ -273,7 +275,7 @@ function create_fresh_base_sysimage(stdlibs::Vector{String}; cpu_target::String,
"JULIA_LOAD_PATH" => "@stdlib")
@debug "running $cmd"

read(cmd)
run(cmd)

create_sysimg_from_object_file(String[tmp_sys_o],
tmp_sys_sl;
Expand Down

0 comments on commit 09ee30b

Please sign in to comment.