Skip to content

Commit e75b10a

Browse files
Bug 1915537 - build(rust): update -Zbuild-std patch for Rust 1.82 r=glandium
Differential Revision: https://phabricator.services.mozilla.com/D236344
1 parent 861f1a2 commit e75b10a

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

build/build-rust/rust-vendor-std.patch

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ For firefox's purposes, these patches still work fine, and are necessary
1212
to make -Zbuild-std work in a vendored environment.
1313

1414
diff --git a/src/bootstrap/src/core/build_steps/dist.rs b/src/bootstrap/src/core/build_steps/dist.rs
15-
index 012d64e5344..aedb53358ef 100644
15+
index 4957de2e1b7..42977709e29 100644
1616
--- a/src/bootstrap/src/core/build_steps/dist.rs
1717
+++ b/src/bootstrap/src/core/build_steps/dist.rs
18-
@@ -927,6 +927,31 @@ fn run(self, builder: &Builder<'_>) -> GeneratedTarball {
19-
builder.copy_link(&builder.src.join(file), &dst_src.join(file));
20-
}
18+
@@ -941,6 +941,31 @@ fn run(self, builder: &Builder<'_>) -> GeneratedTarball {
19+
&dst_src,
20+
);
2121

2222
+ // libsysroot includes std and everything else, so vendoring it
2323
+ // creates exactly what's needed for `cargo -Zbuild-std` or any
@@ -48,10 +48,10 @@ index 012d64e5344..aedb53358ef 100644
4848
}
4949
}
5050
diff --git a/src/bootstrap/src/lib.rs b/src/bootstrap/src/lib.rs
51-
index 5ed6b357e20..ad617948c4b 100644
51+
index 82b640f5423..64c3058c83a 100644
5252
--- a/src/bootstrap/src/lib.rs
5353
+++ b/src/bootstrap/src/lib.rs
54-
@@ -1649,6 +1649,30 @@ fn read_stamp_file(&self, stamp: &Path) -> Vec<(PathBuf, DependencyType)> {
54+
@@ -1648,6 +1648,30 @@ fn read_stamp_file(&self, stamp: &Path) -> Vec<(PathBuf, DependencyType)> {
5555
paths
5656
}
5757

taskcluster/kinds/fetch/toolchains.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -373,13 +373,13 @@ clang-trunk:
373373
# We build stable rust from source so the resulting compiler acts as a nightly
374374
# rust compiler, allowing to use unstable features like -Zbuild-std and
375375
# sanitizers.
376-
rust-1.81.0:
377-
description: Rust 1.81.0 source code
376+
rust-1.82.0:
377+
description: Rust 1.82.0 source code
378378
fetch:
379379
type: git
380380
include-dot-git: true
381381
repo: https://github.com/rust-lang/rust/
382-
revision: eeb90cda1969383f56a2637cbd3037bdf598841c
382+
revision: f6e511eec7342f59a25f7c0534f1dbea00d01b14
383383

384384
rust-nightly:
385385
description: Rust nightly source code

taskcluster/kinds/toolchain/rust.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ linux64-rust-1.84:
9898

9999
# A patched rust toolchain that allows us to use sanitizers in our vendored
100100
# build environment. See the rust fetch's comments for more details.
101-
linux64-rust-1.81-dev:
101+
linux64-rust-1.82-dev:
102102
description: "build rust from source"
103103
worker-type: b-linux-large-gcp
104104
treeherder:
@@ -125,7 +125,7 @@ linux64-rust-1.81-dev:
125125
default: linux64-rust-dev
126126
fetches:
127127
fetch:
128-
- rust-1.81.0
128+
- rust-1.82.0
129129
toolchain:
130130
- linux64-clang-toolchain
131131
- linux64-toolchain-sysroot

0 commit comments

Comments
 (0)