Skip to content

Commit a6fc64c

Browse files
committed
try fix building non-incremental sysimages on nightly
1 parent 38629b0 commit a6fc64c

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

src/PackageCompiler.jl

+9-3
Original file line numberDiff line numberDiff line change
@@ -232,8 +232,14 @@ function create_fresh_base_sysimage(stdlibs::Vector{String}; cpu_target::String,
232232
# PR: https://github.com/JuliaLang/PackageCompiler.jl/pull/930
233233
tmp_sys_sl = joinpath(tmp, "sys." * Libdl.dlext)
234234

235-
compiler_source_path = joinpath(base_dir, "compiler", "compiler.jl")
236235

236+
@static if VERSION >= v"1.12.0-DEV.1617"
237+
compiler_source_path = joinpath(base_dir, "Base_compiler.jl")
238+
compiler_args = `./` # build path
239+
else
240+
compiler_source_path = joinpath(base_dir, "compiler", "compiler.jl")
241+
compiler_args = ``
242+
end
237243
# we can't strip the IR from the base sysimg, so we filter out this flag
238244
# also presumably `--compile=all` and maybe a few others we missed here...
239245
sysimage_build_args_strs = map(p -> "$(p...)", values(sysimage_build_args))
@@ -246,7 +252,7 @@ function create_fresh_base_sysimage(stdlibs::Vector{String}; cpu_target::String,
246252
# Create corecompiler.ji
247253
cmd = `$(get_julia_cmd()) --cpu-target $cpu_target
248254
--output-ji $tmp_corecompiler_ji $sysimage_build_args
249-
$compiler_source_path`
255+
$compiler_source_path $compiler_args`
250256
@debug "running $cmd"
251257

252258
read(cmd)
@@ -263,7 +269,7 @@ function create_fresh_base_sysimage(stdlibs::Vector{String}; cpu_target::String,
263269
cmd = addenv(`$(get_julia_cmd()) --cpu-target $cpu_target
264270
--sysimage=$tmp_corecompiler_ji
265271
$sysimage_build_args --output-o=$tmp_sys_o
266-
$new_sysimage_source_path`,
272+
$new_sysimage_source_path $compiler_args`,
267273
"JULIA_LOAD_PATH" => "@stdlib")
268274
@debug "running $cmd"
269275

0 commit comments

Comments
 (0)