Skip to content

Commit

Permalink
Revert "[CompilerSupportLibraries_jll] Add libssp for more platforms (J…
Browse files Browse the repository at this point in the history
…uliaLang#48027)"

This reverts commit 0f2665f.
  • Loading branch information
giordano committed Jan 9, 2023
1 parent 708d1bd commit a48ad53
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -43,15 +43,11 @@ elseif Sys.isapple()
const libgfortran = string("@rpath/", "libgfortran.", libgfortran_version(HostPlatform()).major, ".dylib")
const libstdcxx = "@rpath/libstdc++.6.dylib"
const libgomp = "@rpath/libgomp.1.dylib"
const libssp = "@rpath/libssp.0.dylib"
else
const libgcc_s = "libgcc_s.so.1"
const libgfortran = string("libgfortran.so.", libgfortran_version(HostPlatform()).major)
const libstdcxx = "libstdc++.so.6"
const libgomp = "libgomp.so.1"
if libc(HostPlatform()) != "musl"
const libssp = "libssp.so.0"
end
end

function __init__()
Expand All @@ -63,7 +59,7 @@ function __init__()
global libstdcxx_path = dlpath(libstdcxx_handle)
global libgomp_handle = dlopen(libgomp)
global libgomp_path = dlpath(libgomp_handle)
@static if libc(HostPlatform()) != "musl"
if Sys.iswindows()
global libssp_handle = dlopen(libssp)
global libssp_path = dlpath(libssp_handle)
end
Expand Down
4 changes: 2 additions & 2 deletions stdlib/CompilerSupportLibraries_jll/test/runtests.jl
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# 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"
if Sys.iswindows()
@test isfile(CompilerSupportLibraries_jll.libssp_path)
end
end

0 comments on commit a48ad53

Please sign in to comment.