Skip to content

Commit 09ee30b

Browse files
author
KristofferC
committed
update
1 parent a6fc64c commit 09ee30b

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

src/PackageCompiler.jl

+5-3
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,9 @@ function create_fresh_base_sysimage(stdlibs::Vector{String}; cpu_target::String,
235235

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

258-
read(cmd)
260+
run(cmd)
259261
end
260262

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

276-
read(cmd)
278+
run(cmd)
277279

278280
create_sysimg_from_object_file(String[tmp_sys_o],
279281
tmp_sys_sl;

0 commit comments

Comments
 (0)