Skip to content

Change naming convention of object files to follow what Base Julia does; also, start testing on macOS again (but only Intel macOS) #930

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

Merged
merged 3 commits into from
Oct 16, 2024
Merged

Change naming convention of object files to follow what Base Julia does; also, start testing on macOS again (but only Intel macOS) #930

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
917882e
Change naming convention of object files to follow what Base Julia does
gbaraldi Mar 19, 2024
70e848c
Add some comments linking to the PR and the bug report
DilumAluthge Oct 15, 2024
71e9274
CI: Resume testing on Intel macOS (#967)
DilumAluthge Oct 15, 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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:
os:
- ubuntu-latest
- windows-latest
# - macos-13 # macos-13 = Intel. # TODO: uncomment this line once we merge #930
- macos-13 # macos-13 = Intel.
# TODO: uncomment the next line, so that we can start testing on macos-14:
# - macos-14 # macos-14 = Apple Silicon.
coverage:
Expand Down
14 changes: 11 additions & 3 deletions src/PackageCompiler.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,11 @@ function create_fresh_base_sysimage(stdlibs::Vector{String}; cpu_target::String,
sysimg_source_path = Base.find_source_file("sysimg.jl")
base_dir = dirname(sysimg_source_path)
tmp_corecompiler_ji = joinpath(tmp, "corecompiler.ji")
tmp_sys_o = joinpath(tmp, "sys.o")
tmp_sys_o = joinpath(tmp, "sys-o.a")
# This naming convention (`sys-o.a`) is necessary to make the sysimage
# work on macOS.
# Bug report: https://github.com/JuliaLang/PackageCompiler.jl/issues/738
# PR: https://github.com/JuliaLang/PackageCompiler.jl/pull/930
tmp_sys_sl = joinpath(tmp, "sys." * Libdl.dlext)

compiler_source_path = joinpath(base_dir, "compiler", "compiler.jl")
Expand Down Expand Up @@ -639,7 +643,11 @@ function create_sysimage(packages::Union{Nothing, Symbol, Vector{String}, Vector
end

# Create the sysimage
object_file = tempname() * ".o"
object_file = tempname() * "-o.a"
# This naming convention (`-o.a`) is necessary to make the sysimage
# work on macOS.
# Bug report: https://github.com/JuliaLang/PackageCompiler.jl/issues/738
# PR: https://github.com/JuliaLang/PackageCompiler.jl/pull/930

create_sysimg_object_file(object_file, packages, packages_sysimg;
project,
Expand Down Expand Up @@ -1428,7 +1436,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