Skip to content

Commit 82fbf54

Browse files
authored
[CompilerSupportLibraries_jll] Add libssp as product on Windows (#48012)
1 parent b838067 commit 82fbf54

File tree

2 files changed

+10
-0
lines changed

2 files changed

+10
-0
lines changed

stdlib/CompilerSupportLibraries_jll/src/CompilerSupportLibraries_jll.jl

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ libstdcxx_handle = C_NULL
2121
libstdcxx_path = ""
2222
libgomp_handle = C_NULL
2323
libgomp_path = ""
24+
libssp_handle = C_NULL
25+
libssp_path = ""
2426

2527
if Sys.iswindows()
2628
if arch(HostPlatform()) == "x86_64"
@@ -31,6 +33,7 @@ if Sys.iswindows()
3133
const libgfortran = string("libgfortran-", libgfortran_version(HostPlatform()).major, ".dll")
3234
const libstdcxx = "libstdc++-6.dll"
3335
const libgomp = "libgomp-1.dll"
36+
const libssp = "libssp-0.dll"
3437
elseif Sys.isapple()
3538
if arch(HostPlatform()) == "aarch64" || libgfortran_version(HostPlatform()) == v"5"
3639
const libgcc_s = "@rpath/libgcc_s.1.1.dylib"
@@ -56,6 +59,10 @@ function __init__()
5659
global libstdcxx_path = dlpath(libstdcxx_handle)
5760
global libgomp_handle = dlopen(libgomp)
5861
global libgomp_path = dlpath(libgomp_handle)
62+
if Sys.iswindows()
63+
global libssp_handle = dlopen(libssp)
64+
global libssp_path = dlpath(libssp_handle)
65+
end
5966
global artifact_dir = dirname(Sys.BINDIR)
6067
LIBPATH[] = dirname(libgcc_s_path)
6168
push!(LIBPATH_list, LIBPATH[])

stdlib/CompilerSupportLibraries_jll/test/runtests.jl

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,7 @@ using Test, CompilerSupportLibraries_jll
77
@test isfile(CompilerSupportLibraries_jll.libgfortran_path)
88
@test isfile(CompilerSupportLibraries_jll.libstdcxx_path)
99
@test isfile(CompilerSupportLibraries_jll.libgomp_path)
10+
if Sys.iswindows()
11+
@test isfile(CompilerSupportLibraries_jll.libssp_path)
12+
end
1013
end

0 commit comments

Comments
 (0)