Skip to content

Commit 2949879

Browse files
authored
make dlopening libssp non fatal (#48333)
1 parent 583aaa3 commit 2949879

File tree

2 files changed

+2
-8
lines changed

2 files changed

+2
-8
lines changed

stdlib/CompilerSupportLibraries_jll/src/CompilerSupportLibraries_jll.jl

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ libstdcxx_handle = C_NULL
2121
libstdcxx_path = ""
2222
libgomp_handle = C_NULL
2323
libgomp_path = ""
24-
libssp_handle = C_NULL
25-
libssp_path = ""
2624

2725
if Sys.iswindows()
2826
if arch(HostPlatform()) == "x86_64"
@@ -64,8 +62,7 @@ function __init__()
6462
global libgomp_handle = dlopen(libgomp)
6563
global libgomp_path = dlpath(libgomp_handle)
6664
@static if libc(HostPlatform()) != "musl"
67-
global libssp_handle = dlopen(libssp)
68-
global libssp_path = dlpath(libssp_handle)
65+
dlopen(libssp; throw_error = false)
6966
end
7067
global artifact_dir = dirname(Sys.BINDIR)
7168
LIBPATH[] = dirname(libgcc_s_path)
Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
11
# This file is a part of Julia. License is MIT: https://julialang.org/license
22

3-
using Test, CompilerSupportLibraries_jll, Base.BinaryPlatforms
3+
using Test, CompilerSupportLibraries_jll
44

55
@testset "CompilerSupportLibraries_jll" begin
66
@test isfile(CompilerSupportLibraries_jll.libgcc_s_path)
77
@test isfile(CompilerSupportLibraries_jll.libgfortran_path)
88
@test isfile(CompilerSupportLibraries_jll.libstdcxx_path)
99
@test isfile(CompilerSupportLibraries_jll.libgomp_path)
10-
if libc(HostPlatform()) != "musl"
11-
@test isfile(CompilerSupportLibraries_jll.libssp_path)
12-
end
1310
end

0 commit comments

Comments
 (0)