Skip to content

Commit 6956bcf

Browse files
max-niedermanTropix126
authored andcommitted
fix circular dependency on cc-rs using a temporary patched version of cc-rs
1 parent 2b8f8fb commit 6956bcf

File tree

3 files changed

+7
-2
lines changed

3 files changed

+7
-2
lines changed

src/bootstrap/Cargo.lock

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,7 @@ dependencies = [
8888
[[package]]
8989
name = "cc"
9090
version = "1.2.0"
91-
source = "registry+https://github.com/rust-lang/crates.io-index"
92-
checksum = "1aeb932158bd710538c73702db6945cb68a8fb08c519e6e12706b94263b36db8"
91+
source = "git+https://github.com/rust-lang/cc-rs?rev=6fe995c675dc1178f570752fa8f6de82913a91dc#6fe995c675dc1178f570752fa8f6de82913a91dc"
9392
dependencies = [
9493
"shlex",
9594
]

src/bootstrap/Cargo.toml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,3 +96,7 @@ debug = 0
9696
[profile.dev.package]
9797
# Only use debuginfo=1 to further reduce compile times.
9898
bootstrap.debug = 1
99+
100+
[patch.crates-io]
101+
# FIXME: remove this once the `armv7a-vex-v5` target is available on nightly and cc-rs is updated with it
102+
cc = { git = "https://github.com/rust-lang/cc-rs", rev = "6fe995c675dc1178f570752fa8f6de82913a91dc" }

src/tools/tidy/src/extdeps.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ const ALLOWED_SOURCES: &[&str] = &[
88
r#""registry+https://github.com/rust-lang/crates.io-index""#,
99
// This is `rust_team_data` used by `site` in src/tools/rustc-perf,
1010
r#""git+https://github.com/rust-lang/team#a5260e76d3aa894c64c56e6ddc8545b9a98043ec""#,
11+
// This is temporarily used to bootstrap the `armv7a_vex_v5` target until cc-rs has it in its generated target list.
12+
r#""git+https://github.com/rust-lang/cc-rs?rev=6fe995c675dc1178f570752fa8f6de82913a91dc#6fe995c675dc1178f570752fa8f6de82913a91dc""#,
1113
];
1214

1315
/// Checks for external package sources. `root` is the path to the directory that contains the

0 commit comments

Comments
 (0)