make dlopening libssp non fatal (#48333)

JuliaLang · Jan 22, 2023 · 2949879 · 2949879
1 parent 583aaa3
commit 2949879
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/stdlib/CompilerSupportLibraries_jll/src/CompilerSupportLibraries_jll.jl b/stdlib/CompilerSupportLibraries_jll/src/CompilerSupportLibraries_jll.jl
@@ -21,8 +21,6 @@ libstdcxx_handle = C_NULL
 libstdcxx_path = ""
 libgomp_handle = C_NULL
 libgomp_path = ""
-libssp_handle = C_NULL
-libssp_path = ""
 
 if Sys.iswindows()
     if arch(HostPlatform()) == "x86_64"
@@ -64,8 +62,7 @@ function __init__()
     global libgomp_handle = dlopen(libgomp)
     global libgomp_path = dlpath(libgomp_handle)
     @static if libc(HostPlatform()) != "musl"
-        global libssp_handle = dlopen(libssp)
-        global libssp_path = dlpath(libssp_handle)
+        dlopen(libssp; throw_error = false)
     end
     global artifact_dir = dirname(Sys.BINDIR)
     LIBPATH[] = dirname(libgcc_s_path)

diff --git a/stdlib/CompilerSupportLibraries_jll/test/runtests.jl b/stdlib/CompilerSupportLibraries_jll/test/runtests.jl
@@ -1,13 +1,10 @@
 # This file is a part of Julia. License is MIT: https://julialang.org/license
 
-using Test, CompilerSupportLibraries_jll, Base.BinaryPlatforms
+using Test, CompilerSupportLibraries_jll
 
 @testset "CompilerSupportLibraries_jll" begin
     @test isfile(CompilerSupportLibraries_jll.libgcc_s_path)
     @test isfile(CompilerSupportLibraries_jll.libgfortran_path)
     @test isfile(CompilerSupportLibraries_jll.libstdcxx_path)
     @test isfile(CompilerSupportLibraries_jll.libgomp_path)
-    if libc(HostPlatform()) != "musl"
-        @test isfile(CompilerSupportLibraries_jll.libssp_path)
-    end
 end