Skip to content

Commit 1258354

Browse files
authored
[PlatformSupport] Remove outdated MinGW headers from Windows builds (#11828)
1 parent 4b7f4c2 commit 1258354

1 file changed

Lines changed: 33 additions & 33 deletions

File tree

0_RootFS/PlatformSupport/build_tarballs.jl

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# ```
66
# using BinaryBuilder
77
# using BinaryBuilder: aatriplet
8-
# for platform in supported_platforms(; experimental=true)
8+
# for platform in supported_platforms()
99
# # Append version numbers for BSD systems
1010
# if Sys.isapple(platform)
1111
# suffix = arch(platform) == "aarch64" ? "20" : "14"
@@ -15,7 +15,7 @@
1515
# suffix = ""
1616
# end
1717
# target = aatriplet(platform) * suffix
18-
# run(`julia build_tarballs.jl --debug --verbose --deploy $target`)
18+
# run(`$(Base.julia_cmd()) build_tarballs.jl --debug --verbose --deploy $target`)
1919
# end
2020
# ```
2121
# (Note that `--deploy` requires a GitHub personal access token in a `GITHUB_TOKEN`
@@ -26,6 +26,7 @@
2626
# PlatformSupport version to use in `choose_shards` to be `v<today's date>`.
2727

2828
using BinaryBuilder, Dates, Pkg, Base.BinaryPlatforms
29+
using BinaryBuilderBase: AbstractSource
2930
include("../common.jl")
3031

3132
# Don't mount any shards that you don't need to
@@ -46,34 +47,40 @@ if (Sys.isapple(compiler_target) || Sys.isfreebsd(compiler_target)) && os_versio
4647
error("Compiler target $(triplet(compiler_target)) does not have an `os_version` tag!")
4748
end
4849

49-
sources = [
50-
ArchiveSource("https://mirrors.edge.kernel.org/pub/linux/kernel/v4.x/linux-4.20.9.tar.xz",
51-
"b5de28fd594a01edacd06e53491ad0890293e5fbf98329346426cf6030ef1ea6"),
52-
ArchiveSource("https://sourceforge.net/projects/mingw-w64/files/mingw-w64/mingw-w64-release/mingw-w64-v7.0.0.tar.bz2",
53-
"aa20dfff3596f08a7f427aab74315a6cb80c2b086b4a107ed35af02f9496b628"),
54-
ArchiveSource("https://github.com/llvm/llvm-project/releases/download/llvmorg-8.0.1/libcxx-8.0.1.src.tar.xz",
55-
"7f0652c86a0307a250b5741ab6e82bb10766fb6f2b5a5602a63f30337e629b78"),
56-
]
57-
58-
freebsd_base = if Sys.isfreebsd(compiler_target) && arch(compiler_target) == "aarch64"
59-
ArchiveSource("http://ftp-archive.freebsd.org/pub/FreeBSD-Archive/old-releases/arm64/14.1-RELEASE/base.txz",
60-
"b25830252e0dce0161004a5b69a159cbbd92d5e92ae362b06158dbb3f2568d32")
61-
else
62-
ArchiveSource("http://ftp-archive.freebsd.org/pub/FreeBSD-Archive/old-releases/amd64/13.4-RELEASE/base.txz",
63-
"8e13b0a93daba349b8d28ad246d7beb327659b2ef4fe44d89f447392daec5a7c")
64-
end
50+
sources = AbstractSource[]
6551

66-
push!(sources, freebsd_base)
52+
if Sys.islinux(compiler_target)
53+
push!(sources,
54+
ArchiveSource("https://mirrors.edge.kernel.org/pub/linux/kernel/v4.x/linux-4.20.9.tar.xz",
55+
"b5de28fd594a01edacd06e53491ad0890293e5fbf98329346426cf6030ef1ea6"))
56+
end
6757

68-
macos_sdk = if Sys.isapple(compiler_target) && arch(compiler_target) == "aarch64"
69-
ArchiveSource("https://github.com/phracker/MacOSX-SDKs/releases/download/11.0-11.1/MacOSX11.1.sdk.tar.xz",
70-
"9b86eab03176c56bb526de30daa50fa819937c54b280364784ce431885341bf6")
71-
else
72-
ArchiveSource("https://github.com/phracker/MacOSX-SDKs/releases/download/10.15/MacOSX10.12.sdk.tar.xz",
73-
"6852728af94399193599a55d00ae9c4a900925b6431534a3816496b354926774")
58+
if Sys.isfreebsd(compiler_target)
59+
if arch(compiler_target) == "aarch64"
60+
push!(sources,
61+
ArchiveSource("http://ftp-archive.freebsd.org/pub/FreeBSD-Archive/old-releases/arm64/14.1-RELEASE/base.txz",
62+
"b25830252e0dce0161004a5b69a159cbbd92d5e92ae362b06158dbb3f2568d32"))
63+
else
64+
push!(sources,
65+
ArchiveSource("http://ftp-archive.freebsd.org/pub/FreeBSD-Archive/old-releases/amd64/13.4-RELEASE/base.txz",
66+
"8e13b0a93daba349b8d28ad246d7beb327659b2ef4fe44d89f447392daec5a7c"))
67+
end
7468
end
7569

76-
push!(sources, macos_sdk)
70+
if Sys.isapple(compiler_target)
71+
push!(sources,
72+
ArchiveSource("https://github.com/llvm/llvm-project/releases/download/llvmorg-8.0.1/libcxx-8.0.1.src.tar.xz",
73+
"7f0652c86a0307a250b5741ab6e82bb10766fb6f2b5a5602a63f30337e629b78"))
74+
if arch(compiler_target) == "aarch64"
75+
push!(sources,
76+
ArchiveSource("https://github.com/phracker/MacOSX-SDKs/releases/download/11.0-11.1/MacOSX11.1.sdk.tar.xz",
77+
"9b86eab03176c56bb526de30daa50fa819937c54b280364784ce431885341bf6"))
78+
else
79+
push!(sources,
80+
ArchiveSource("https://github.com/phracker/MacOSX-SDKs/releases/download/10.15/MacOSX10.12.sdk.tar.xz",
81+
"6852728af94399193599a55d00ae9c4a900925b6431534a3816496b354926774"))
82+
end
83+
end
7784

7885
script = "COMPILER_TARGET=$(BinaryBuilder.aatriplet(compiler_target))\n" * raw"""
7986
## Function to take in a target such as `aarch64-linux-gnu`` and spit out a
@@ -133,13 +140,6 @@ case "${COMPILER_TARGET}" in
133140
;;
134141
135142
*-mingw*)
136-
cd $WORKSPACE/srcdir/mingw-*/mingw-w64-headers
137-
./configure --prefix=/ \
138-
--enable-sdk=all \
139-
--enable-secure-api \
140-
--host=${COMPILER_TARGET}
141-
142-
make install DESTDIR=${sysroot}
143143
;;
144144
145145
*-freebsd*)

0 commit comments

Comments
 (0)