From 09ee30b5ec7c022840a65c27580868255994e941 Mon Sep 17 00:00:00 2001 From: KristofferC Date: Wed, 20 Nov 2024 14:08:52 +0100 Subject: [PATCH] update --- src/PackageCompiler.jl | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/PackageCompiler.jl b/src/PackageCompiler.jl index 545d3288..3b36b293 100644 --- a/src/PackageCompiler.jl +++ b/src/PackageCompiler.jl @@ -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 = `` @@ -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)") @@ -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;