Skip to content

Make the base sysimage not include any stdlibs #900

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Make the base sysimage not include any stdlibs #900

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9e05842
Make the base sysimage not include any stdlibs
Dec 13, 2023
dc152ae
Merge branch 'master' into kc/fds
sjkelly Jun 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 8 additions & 9 deletions src/PackageCompiler.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,16 +211,16 @@ function get_julia_cmd()
end


function rewrite_sysimg_jl_only_needed_stdlibs(stdlibs::Vector{String})
function rewrite_sysimg_jl_no_stdlibs()
sysimg_source_path = Base.find_source_file("sysimg.jl")
sysimg_content = read(sysimg_source_path, String)
# replaces the hardcoded list of stdlibs in sysimg.jl with
# the stdlibs that is given as argument


return replace(sysimg_content,
r"stdlibs = \[(.*?)\]"s => string("stdlibs = [", join(":" .* stdlibs, ",\n"), "]"))
r"stdlibs = \[(.*?)\]"s => string("stdlibs = []"))
end

function create_fresh_base_sysimage(stdlibs::Vector{String}; cpu_target::String, sysimage_build_args::Cmd)
function create_fresh_base_sysimage(; cpu_target::String, sysimage_build_args::Cmd)
tmp = mktempdir()
sysimg_source_path = Base.find_source_file("sysimg.jl")
base_dir = dirname(sysimg_source_path)
Expand Down Expand Up @@ -251,7 +251,7 @@ function create_fresh_base_sysimage(stdlibs::Vector{String}; cpu_target::String,
spinner = TerminalSpinners.Spinner(msg = "PackageCompiler: compiling fresh sysimage (incremental=false)")
TerminalSpinners.@spin spinner begin
# Use that to create sys.ji
new_sysimage_content = rewrite_sysimg_jl_only_needed_stdlibs(stdlibs)
new_sysimage_content = rewrite_sysimg_jl_no_stdlibs()
new_sysimage_content *= "\nempty!(Base.atexit_hooks)\n"
new_sysimage_source_path = joinpath(tmp, "sysimage_packagecompiler_$(uuid1()).jl")
write(new_sysimage_source_path, new_sysimage_content)
Expand Down Expand Up @@ -574,8 +574,7 @@ function create_sysimage(packages::Union{Nothing, Symbol, Vector{String}, Vector
if base_sysimage !== nothing
error("cannot specify `base_sysimage` when `incremental=false`")
end
sysimage_stdlibs = filter_stdlibs ? gather_stdlibs_project(ctx) : stdlibs_in_sysimage()
base_sysimage = create_fresh_base_sysimage(sysimage_stdlibs; cpu_target, sysimage_build_args)
base_sysimage = create_fresh_base_sysimage(; cpu_target, sysimage_build_args)
else
base_sysimage = something(base_sysimage, unsafe_string(Base.JLOptions().image_file))
end
Expand Down Expand Up @@ -1411,7 +1410,7 @@ function bundle_julia_libexec(ctx, dest_dir)
p7zip_exe = basename(p7zip_path)
cp(p7zip_path, joinpath(bundle_libexec_dir, p7zip_exe))

return
return
end

function recursive_dir_size(path)
Expand Down
Loading