Skip to content

Commit 98270f8

Browse files
Auto merge of #146186 - dpaoliello:cc, r=<try>
Update cc-rs to 1.2.33, and switch rustc_codegen_ssa to use find-msvc-tools try-job: dist-aarch64-linux
2 parents 975e6c8 + ea1101f commit 98270f8

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

Cargo.lock

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -462,9 +462,9 @@ version = "0.1.0"
462462

463463
[[package]]
464464
name = "cc"
465-
version = "1.2.16"
465+
version = "1.2.33"
466466
source = "registry+https://github.com/rust-lang/crates.io-index"
467-
checksum = "be714c154be609ec7f5dad223a33bf1482fff90472de28f7362806e6d4832b8c"
467+
checksum = "3ee0f8803222ba5a7e2777dd72ca451868909b1ac410621b676adf07280e9b5f"
468468
dependencies = [
469469
"jobserver",
470470
"libc",
@@ -5504,8 +5504,7 @@ version = "0.1.0"
55045504
[[package]]
55055505
name = "tikv-jemalloc-sys"
55065506
version = "0.6.0+5.3.0-1-ge13ca993e8ccb9ba9847cc330696e02839f328f7"
5507-
source = "registry+https://github.com/rust-lang/crates.io-index"
5508-
checksum = "cd3c60906412afa9c2b5b5a48ca6a5abe5736aec9eb48ad05037a677e52e4e2d"
5507+
source = "git+https://github.com/dpaoliello/jemallocator.git?branch=filterlto#6db31514fd2241445a4b5f350ef0f9a214d69793"
55095508
dependencies = [
55105509
"cc",
55115510
"libc",

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,5 +91,5 @@ codegen-units = 1
9191

9292
# If you want to use a crate with local modifications, you can set a path or git dependency here.
9393
# For git dependencies, also add your source to ALLOWED_SOURCES in src/tools/tidy/src/extdeps.rs.
94-
#[patch.crates-io]
95-
94+
[patch.crates-io]
95+
tikv-jemalloc-sys = { git = 'https://github.com/dpaoliello/jemallocator.git', branch = 'filterlto' }

compiler/rustc_llvm/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ libc = "0.2.73"
1111
[build-dependencies]
1212
# tidy-alphabetical-start
1313
# `cc` updates often break things, so we pin it here.
14-
cc = "=1.2.16"
14+
cc = "=1.2.33"
1515
# tidy-alphabetical-end
1616

1717
[features]

src/tools/tidy/src/extdeps.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ const ALLOWED_SOURCES: &[&str] = &[
1111
r#""registry+https://github.com/rust-lang/crates.io-index""#,
1212
// This is `rust_team_data` used by `site` in src/tools/rustc-perf,
1313
r#""git+https://github.com/rust-lang/team#a5260e76d3aa894c64c56e6ddc8545b9a98043ec""#,
14+
r#""git+https://github.com/dpaoliello/jemallocator.git?branch=filterlto#6db31514fd2241445a4b5f350ef0f9a214d69793""#,
1415
];
1516

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

0 commit comments

Comments
 (0)