From 917882efa0d93bf2dbabae9995bc35493aafcbc8 Mon Sep 17 00:00:00 2001 From: gbaraldi Date: Tue, 19 Mar 2024 12:23:05 -0300 Subject: [PATCH 1/3] Change naming convention of object files to follow what Base Julia does --- src/PackageCompiler.jl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/PackageCompiler.jl b/src/PackageCompiler.jl index a6a41155..3c2d97b8 100644 --- a/src/PackageCompiler.jl +++ b/src/PackageCompiler.jl @@ -225,7 +225,7 @@ 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") tmp_sys_sl = joinpath(tmp, "sys." * Libdl.dlext) compiler_source_path = joinpath(base_dir, "compiler", "compiler.jl") @@ -639,7 +639,7 @@ function create_sysimage(packages::Union{Nothing, Symbol, Vector{String}, Vector end # Create the sysimage - object_file = tempname() * ".o" + object_file = tempname() * "-o.a" create_sysimg_object_file(object_file, packages, packages_sysimg; project, @@ -1428,7 +1428,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) From 70e848c95f4f8c502a8ad8b18a2bf71a6df5c11e Mon Sep 17 00:00:00 2001 From: Dilum Aluthge Date: Tue, 15 Oct 2024 18:51:14 -0400 Subject: [PATCH 2/3] Add some comments linking to the PR and the bug report Thus, future readers of the source code will understand why we use this naming convention. [Applies suggestions from code review.] --- src/PackageCompiler.jl | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/PackageCompiler.jl b/src/PackageCompiler.jl index 3c2d97b8..631536c5 100644 --- a/src/PackageCompiler.jl +++ b/src/PackageCompiler.jl @@ -226,6 +226,10 @@ function create_fresh_base_sysimage(stdlibs::Vector{String}; cpu_target::String, base_dir = dirname(sysimg_source_path) tmp_corecompiler_ji = joinpath(tmp, "corecompiler.ji") 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") @@ -640,6 +644,10 @@ function create_sysimage(packages::Union{Nothing, Symbol, Vector{String}, Vector # Create the sysimage 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, From 71e9274e30ea16d1fe7764d46b736205be81c1e5 Mon Sep 17 00:00:00 2001 From: Dilum Aluthge Date: Tue, 15 Oct 2024 19:31:09 -0400 Subject: [PATCH 3/3] CI: Resume testing on Intel macOS (#967) --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e55dcc97..fe926c50 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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: