Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,12 @@ jobs:
julia-version:
- '1.10' # current LTS
- '1.11' # current stable

#
# 'pre' will install the latest prerelease build (RCs, betas, and alphas).
# Uncomment this line when there is an active prerelease available.
# Comment this line out when there is no prerelease available (to save CI time).
# - 'pre'
- 'pre'
#
# Note: we have a separate workflow (.github/workflows/ci.nightly.yml)
# for Julia nightly.
Expand Down
5 changes: 4 additions & 1 deletion src/embedding_wrapper.c
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,10 @@ int main(int argc, char *argv[]) {
jl_value_t *firstarg = checked_eval_string("popfirst!(ARGS)");
JL_GC_PUSH1(&firstarg);
jl_sym_t *var = jl_symbol("PROGRAM_FILE");
#if JULIA_VERSION_MAJOR == 1 && JULIA_VERSION_MINOR >= 11
#if JULIA_VERSION_MAJOR == 1 && JULIA_VERSION_MINOR >= 12
jl_binding_t *bp = jl_get_binding_wr(jl_base_module, var);
jl_checked_assignment(bp, jl_base_module, var, firstarg);
#elif JULIA_VERSION_MAJOR == 1 && JULIA_VERSION_MINOR >= 11
jl_binding_t *bp = jl_get_binding_wr(jl_base_module, var, /* alloc */ 1);
jl_checked_assignment(bp, jl_base_module, var, firstarg);
#elif JULIA_VERSION_MAJOR == 1 && JULIA_VERSION_MINOR >= 10
Expand Down
5 changes: 4 additions & 1 deletion src/julia_init.c
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,12 @@ void init_julia(int argc, char **argv) {
char *root_dir = dirname(dirname(_sysimage_path));
set_depot_load_path(root_dir);
free(_sysimage_path);

jl_options.image_file = sysimage_path;
#if JULIA_VERSION_MAJOR == 1 && JULIA_VERSION_MINOR <= 11
julia_init(JL_IMAGE_CWD);
#else
jl_init_with_image_file(NULL, sysimage_path);
#endif
}

void shutdown_julia(int retcode) { jl_atexit_hook(retcode); }
1 change: 1 addition & 0 deletions src/library_selection.jl
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ const jll_mapping = Dict(
"nghttp2_jll" => ["libnghttp2"],
"LibGit2_jll" => ["libgit2"],
"SuiteSparse_jll" => ["libamd", "libbtf", "libcamd", "libccolamd", "libcholmod", "libcolamd", "libklu", "libldl", "librbio", "libspqr", "libsuitesparseconfig", "libumfpack"],
"OpenSSL_jll" => ["libcrypto", "libssl"],
)

# Manually fixup of libLLVM
Expand Down
Loading