Skip to content

Commit 588e93b

Browse files
committed
Switch most toolchain deps to main from GCCBootstrap
1 parent e29ec49 commit 588e93b

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

BinaryBuilderToolchains.jl/src/toolchains/CToolchain.jl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ function jll_source_selection(vendor::Symbol, platform::CrossPlatform,
286286
"Mingw_jll",
287287
platform.target;
288288
repo=Pkg.Types.GitRepo(
289-
rev="bb2/GCCBootstrap",
289+
rev="main",
290290
source="https://github.com/staticfloat/Mingw_jll.jl",
291291
),
292292
target=sysroot_path,
@@ -328,8 +328,8 @@ function jll_source_selection(vendor::Symbol, platform::CrossPlatform,
328328
"Binutils_jll",
329329
platform;
330330
repo=Pkg.Types.GitRepo(
331-
#rev="bb2/GCC",
332-
rev="c5da93839bef6c88d3b7ecf4109eb9fe0c716a34",
331+
rev="main",
332+
#rev="c5da93839bef6c88d3b7ecf4109eb9fe0c716a34",
333333
source="https://github.com/staticfloat/Binutils_jll.jl",
334334
),
335335
# eventually, include a resolved version
@@ -515,7 +515,7 @@ function jll_source_selection(vendor::Symbol, platform::CrossPlatform,
515515
"LinuxKernelHeaders_jll",
516516
platform.target;
517517
repo=Pkg.Types.GitRepo(
518-
rev="bb2/GCC",
518+
rev="main",
519519
source="https://github.com/staticfloat/LinuxKernelHeaders_jll.jl"
520520
),
521521
# LinuxKernelHeaders gets installed into `<prefix>/<triplet>/usr`

bootstrap/Binutils/build_tarballs.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ for version in (v"2.41",) #keys(binutils_version_sources)
117117
"Zlib_jll";
118118
# TODO: Drop this once `Zlib_jll` on `General` is built by BB2.
119119
repo=Pkg.Types.GitRepo(
120-
rev="bb2/GCC",
120+
rev="main",
121121
source="https://github.com/staticfloat/Zlib_jll.jl"
122122
),
123123
),

bootstrap/CCTools/build_tarballs.jl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ build_tarballs(;
4646
JLLSource(
4747
"Zlib_jll";
4848
repo=Pkg.Types.GitRepo(
49-
rev="bb2/GCC",
49+
rev="main",
5050
source="https://github.com/staticfloat/Zlib_jll.jl"
5151
),
5252
),
@@ -92,7 +92,7 @@ build_tarballs(;
9292
JLLSource(
9393
"Zlib_jll";
9494
repo=Pkg.Types.GitRepo(
95-
rev="bb2/GCC",
95+
rev="main",
9696
source="https://github.com/staticfloat/Zlib_jll.jl"
9797
),
9898
),
@@ -120,7 +120,7 @@ function cctools_build_spec_generator(host, platform)
120120
"Zlib_jll";
121121
# TODO: Drop this once `Zlib_jll` on `General` is built by BB2.
122122
repo=Pkg.Types.GitRepo(
123-
rev="bb2/GCC",
123+
rev="main",
124124
source="https://github.com/staticfloat/Zlib_jll.jl"
125125
),
126126
),

bootstrap/CrosstoolNG/build_tarballs.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ build_tarballs(;
1616
JLLSource(
1717
"Zlib_jll";
1818
repo=Pkg.Types.GitRepo(
19-
rev="bb2/GCC",
19+
rev="main",
2020
source="https://github.com/staticfloat/Zlib_jll.jl"
2121
),
2222
),

0 commit comments

Comments
 (0)