Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[CompilerSupportLibraries_jll] Add libssp as product on Windows #48012

Merged
merged 1 commit into from
Dec 28, 2022
Merged

[CompilerSupportLibraries_jll] Add libssp as product on Windows #48012

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 7 additions & 0 deletions stdlib/CompilerSupportLibraries_jll/src/CompilerSupportLibraries_jll.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ 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"
Expand All @@ -31,6 +33,7 @@ if Sys.iswindows()
const libgfortran = string("libgfortran-", libgfortran_version(HostPlatform()).major, ".dll")
const libstdcxx = "libstdc++-6.dll"
const libgomp = "libgomp-1.dll"
const libssp = "libssp-0.dll"
elseif Sys.isapple()
if arch(HostPlatform()) == "aarch64" || libgfortran_version(HostPlatform()) == v"5"
const libgcc_s = "@rpath/libgcc_s.1.1.dylib"
Expand All @@ -56,6 +59,10 @@ function __init__()
global libstdcxx_path = dlpath(libstdcxx_handle)
global libgomp_handle = dlopen(libgomp)
global libgomp_path = dlpath(libgomp_handle)
if Sys.iswindows()
global libssp_handle = dlopen(libssp)
global libssp_path = dlpath(libssp_handle)
end
global artifact_dir = dirname(Sys.BINDIR)
LIBPATH[] = dirname(libgcc_s_path)
push!(LIBPATH_list, LIBPATH[])
Expand Down
3 changes: 3 additions & 0 deletions stdlib/CompilerSupportLibraries_jll/test/runtests.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,7 @@ using Test, CompilerSupportLibraries_jll
@test isfile(CompilerSupportLibraries_jll.libgfortran_path)
@test isfile(CompilerSupportLibraries_jll.libstdcxx_path)
@test isfile(CompilerSupportLibraries_jll.libgomp_path)
if Sys.iswindows()
@test isfile(CompilerSupportLibraries_jll.libssp_path)
end
end