Skip to content

Commit ddee828

Browse files
authored
[CompilerSupportLibraries] Add libssp as product (#6027)
* [CompilerSupportLibraries] Add `libssp` as product * [CompilerSupportLibraries] Add libssp on non-Musl platforms [skip build]
1 parent 6c5670c commit ddee828

File tree

2 files changed

+12
-8
lines changed

2 files changed

+12
-8
lines changed

C/CompilerSupportLibraries/CompilerSupportLibraries@v1.0/build_tarballs.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ include("../common.jl")
22

33
build_csl(ARGS, v"1.0.2"; preferred_gcc_version=v"12", windows_staticlibs=true, julia_compat="1.9")
44

5-
# Build trigger: 1
5+
# Build trigger: 2

C/CompilerSupportLibraries/common.jl

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -150,16 +150,20 @@ install_license /usr/share/licenses/GPL-3.0+
150150
# Don't push to the common products, otherwise we'll keep
151151
# accumulating libatomic into it when looping over all platforms.
152152
vcat(common_products, LibraryProduct("libatomic", :libatomic))
153-
elseif windows_staticlibs && Sys.iswindows(platform)
154-
vcat(common_products,
155-
[FileProduct("lib/libmsvcrt.a", :libmsvcrt_a),
156-
FileProduct("lib/libgcc.a", :libgcc_a),
157-
FileProduct("lib/libgcc_s.a", :libgcc_s_a),
158-
FileProduct("lib/libssp.dll.a", :libssp_dll_a),
159-
])
160153
else
161154
common_products
162155
end
156+
if windows_staticlibs && Sys.iswindows(platform)
157+
products = vcat(products,
158+
[FileProduct("lib/libmsvcrt.a", :libmsvcrt_a),
159+
FileProduct("lib/libgcc.a", :libgcc_a),
160+
FileProduct("lib/libgcc_s.a", :libgcc_s_a),
161+
FileProduct("lib/libssp.dll.a", :libssp_dll_a),
162+
])
163+
end
164+
if libc(platform) != "musl"
165+
products = vcat(products, LibraryProduct("libssp", :libssp))
166+
end
163167
build_tarballs(ARGS, name, version, sources, script, [platform], products, []; preferred_gcc_version, julia_compat)
164168
end
165169
end

0 commit comments

Comments
 (0)