Skip to content

Commit ffeeabd

Browse files
authored
add an env variable needed on 1.10 when creating the base sysimage (#912)
1 parent 67065d6 commit ffeeabd

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
julia-version:
2929
- '1.6'
3030
- '1.9'
31-
- '1.10-nightly'
31+
- '1.10'
3232
- 'nightly'
3333
julia-arch:
3434
- 'x64'
@@ -75,4 +75,3 @@ jobs:
7575
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # If authenticating with GitHub Actions token
7676
DOCUMENTER_KEY: ${{ secrets.DOCUMENTER_KEY }} # If authenticating with SSH deploy key
7777
run: julia --project=docs/ -e 'using Pkg; Pkg.instantiate(); include("docs/make.jl")'
78-

src/PackageCompiler.jl

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -256,10 +256,11 @@ function create_fresh_base_sysimage(stdlibs::Vector{String}; cpu_target::String,
256256
new_sysimage_source_path = joinpath(tmp, "sysimage_packagecompiler_$(uuid1()).jl")
257257
write(new_sysimage_source_path, new_sysimage_content)
258258
try
259-
cmd = `$(get_julia_cmd()) --cpu-target $cpu_target
259+
cmd = addenv(`$(get_julia_cmd()) --cpu-target $cpu_target
260260
--sysimage=$tmp_corecompiler_ji
261261
$sysimage_build_args --output-o=$tmp_sys_o
262-
$new_sysimage_source_path`
262+
$new_sysimage_source_path`,
263+
"JULIA_LOAD_PATH" => "@stdlib")
263264
@debug "running $cmd"
264265

265266
read(cmd)

0 commit comments

Comments
 (0)