Skip to content

Commit 07440d9

Browse files
committed
WIP: Link to libgcc when statically linking musl
1 parent 67100f6 commit 07440d9

File tree

6 files changed

+28
-3
lines changed

6 files changed

+28
-3
lines changed

.github/workflows/ci.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,15 @@ jobs:
152152
- name: dist-x86_64-linux
153153
os: ubuntu-latest-xl
154154
env: {}
155+
- name: dist-various-1
156+
os: ubuntu-latest-xl
157+
env: {}
158+
- name: dist-i586-gnu-i586-i686-musl
159+
os: ubuntu-latest-xl
160+
env: {}
161+
- name: dist-x86_64-musl
162+
os: ubuntu-latest-xl
163+
env: {}
155164
timeout-minutes: 600
156165
runs-on: "${{ matrix.os }}"
157166
steps:

Cargo.lock

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1808,8 +1808,7 @@ checksum = "b294d6fa9ee409a054354afc4352b0b9ef7ca222c69b8812cbea9e7d2bf3783f"
18081808
[[package]]
18091809
name = "libc"
18101810
version = "0.2.71"
1811-
source = "registry+https://github.com/rust-lang/crates.io-index"
1812-
checksum = "9457b06509d27052635f90d6466700c65095fdf75409b3fbdd903e988b886f49"
1811+
source = "git+https://github.com/Amanieu/libc?branch=musl_libgcc2#09bdb4650962ad574403488776e1e200e949451d"
18131812
dependencies = [
18141813
"rustc-std-workspace-core",
18151814
]

Cargo.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,5 +79,7 @@ rustc-std-workspace-core = { path = 'src/tools/rustc-std-workspace-core' }
7979
rustc-std-workspace-alloc = { path = 'src/tools/rustc-std-workspace-alloc' }
8080
rustc-std-workspace-std = { path = 'src/tools/rustc-std-workspace-std' }
8181

82+
libc = { git = "https://github.com/Amanieu/libc", branch = "musl_libgcc2" }
83+
8284
[patch."https://github.com/rust-lang/rust-clippy"]
8385
clippy_lints = { path = "src/tools/clippy/clippy_lints" }

src/ci/azure-pipelines/try.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@ jobs:
2626
strategy:
2727
matrix:
2828
dist-x86_64-linux: {}
29+
dist-various-1: {}
30+
dist-i586-gnu-i586-i686-musl: {}
31+
dist-x86_64-musl: {}
2932

3033
# The macOS and Windows builds here are currently disabled due to them not being
3134
# overly necessary on `try` builds. We also don't actually have anything that

src/ci/github-actions/ci.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -281,6 +281,15 @@ jobs:
281281
- name: dist-x86_64-linux
282282
<<: *job-linux-xl
283283

284+
- name: dist-various-1
285+
<<: *job-linux-xl
286+
287+
- name: dist-i586-gnu-i586-i686-musl
288+
<<: *job-linux-xl
289+
290+
- name: dist-x86_64-musl
291+
<<: *job-linux-xl
292+
284293
auto:
285294
<<: *base-ci-job
286295
name: auto

src/tools/tidy/src/extdeps.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,10 @@ use std::fs;
44
use std::path::Path;
55

66
/// List of whitelisted sources for packages.
7-
const WHITELISTED_SOURCES: &[&str] = &["\"registry+https://github.com/rust-lang/crates.io-index\""];
7+
const WHITELISTED_SOURCES: &[&str] = &[
8+
"\"registry+https://github.com/rust-lang/crates.io-index\"",
9+
"\"git+https://github.com/Amanieu/libc?branch=musl_libgcc2#09bdb4650962ad574403488776e1e200e949451d\"",
10+
];
811

912
/// Checks for external package sources.
1013
pub fn check(path: &Path, bad: &mut bool) {

0 commit comments

Comments
 (0)