Skip to content

Commit

Permalink
[CompilerSupportLibraries_jll] Add libssp as product on Windows (#4…
Browse files Browse the repository at this point in the history
  • Loading branch information
giordano authored Dec 28, 2022
1 parent b838067 commit 82fbf54
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 0 deletions.
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
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

2 comments on commit 82fbf54

@nanosoldier
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Executing the daily package evaluation, I will reply here when finished:

@nanosoldier runtests(isdaily = true)

@nanosoldier
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Your package evaluation job has completed - possible new issues were detected. A full report can be found here.

Please sign in to comment.