mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 1841905 - Update builders to rustc 1.72. r=firefox-build-system-reviewers,andi 

Differential Revision: https://phabricator.services.mozilla.com/D186682
This commit is contained in:
Mike Hommey 2023-08-28 21:02:47 +00:00
Родитель 71ac4d413d
Коммит 625cfd2e2f
4 изменённых файлов: 26 добавлений и 25 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

3
build/build-rust/rust-vendor-std.patch
Просмотреть файл

@ -15,7 +15,7 @@ diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs
index 3cb0eccd324..a3b8154c024 100644
--- a/src/bootstrap/dist.rs
+++ b/src/bootstrap/dist.rs
@@ -905,6 +905,30 @@ fn run(self, builder: &Builder<'_>) -> GeneratedTarball {
@@ -905,6 +905,31 @@ fn run(self, builder: &Builder<'_>) -> GeneratedTarball {
builder.copy(&builder.src.join(file), &dst_src.join(file));
}
@ -37,6 +37,7 @@ index 3cb0eccd324..a3b8154c024 100644
+
+ let mut cmd = Command::new(&builder.initial_cargo);
+ cmd.arg("vendor").arg(dst_vendor).current_dir(&dst_libsysroot);
+ cmd.env("RUSTC_BOOTSTRAP", "1");
+ builder.info("Dist src");
+ let _time = timeit(builder);
+ builder.run(&mut cmd);

4
mozglue/static/rust/build.rs
Просмотреть файл

@ -16,10 +16,10 @@ fn main() {
println!("cargo:rerun-if-changed=wrappers.cpp");
let ver = version().unwrap();
let max_oom_hook_version = Version::parse("1.72.0-alpha").unwrap();
let max_oom_hook_version = Version::parse("1.73.0-alpha").unwrap();
// The new alloc error panic feature was temporarily reverted. We kept the
// code in tree, but the version here is such that it's effectively never used.
let max_alloc_error_panic_version = Version::parse("1.72.0-alpha").unwrap();
let max_alloc_error_panic_version = Version::parse("1.73.0-alpha").unwrap();
if ver < max_oom_hook_version {
println!("cargo:rustc-cfg=feature=\"oom_with_hook\"");

6
taskcluster/ci/fetch/toolchains.yml
Просмотреть файл

@ -380,13 +380,13 @@ clang-trunk:
# We build stable rust from source so the resulting compiler acts as a nightly
# rust compiler, allowing to use unstable features like -Zbuild-std and
# sanitizers.
rust-1.71.0:
description: Rust 1.71.0 source code
rust-1.72.0:
description: Rust 1.72.0 source code
fetch:
type: git
include-dot-git: true
repo: https://github.com/rust-lang/rust/
revision: 8ede3aae28fe6e4d52b38157d7bfe0d3bceef225
revision: 5680fa18feaa87f3ff04063800aec256c3d4b4be
wasi-sdk:
description: wasi-sdk-20 source code

38
taskcluster/ci/toolchain/rust.yml
Просмотреть файл

@ -39,12 +39,12 @@ linux64-rust-1.66:
toolchain-alias:
- linux64-rust-base
linux64-rust-1.71:
linux64-rust-1.72:
treeherder:
symbol: TL(rust)
run:
arguments: [
'--channel', '1.71.0',
'--channel', '1.72.0',
'--host', 'x86_64-unknown-linux-gnu',
'--target', 'x86_64-unknown-linux-gnu',
'--target', 'i686-unknown-linux-gnu',
@ -75,17 +75,17 @@ linux64-rust-dev:
]
fetches:
fetch:
- rust-1.71.0
- rust-1.72.0
toolchain:
- linux64-clang-toolchain
linux64-rust-cross-1.71:
linux64-rust-cross-1.72:
description: "rust repack with macos and windows cross support"
treeherder:
symbol: TL(rust-cross)
run:
arguments: [
'--channel', '1.71.0',
'--channel', '1.72.0',
'--host', 'x86_64-unknown-linux-gnu',
'--target', 'x86_64-unknown-linux-gnu',
'--target', 'i686-unknown-linux-gnu',
@ -124,13 +124,13 @@ linux64-rust-cross-beta:
'--target', 'x86_64-linux-android',
]
linux64-rust-static-1.71:
linux64-rust-static-1.72:
description: "rust repack with static linking support"
treeherder:
symbol: TL(rust-static)
run:
arguments: [
'--channel', '1.71.0',
'--channel', '1.72.0',
'--host', 'x86_64-unknown-linux-gnu',
'--target', 'aarch64-unknown-linux-musl',
'--target', 'x86_64-unknown-linux-gnu',
@ -154,13 +154,13 @@ linux64-rust-macos-1.65:
]
toolchain-alias: linux64-rust-macos-toolchain
linux64-rust-macos-1.71:
linux64-rust-macos-1.72:
description: "rust repack with macos-cross support"
treeherder:
symbol: TL(rust-macos)
run:
arguments: [
'--channel', '1.71.0',
'--channel', '1.72.0',
'--host', 'x86_64-unknown-linux-gnu',
'--target', 'x86_64-unknown-linux-gnu',
'--target', 'x86_64-apple-darwin',
@ -168,13 +168,13 @@ linux64-rust-macos-1.71:
]
toolchain-alias: linux64-rust-macos
linux64-rust-android-1.71:
linux64-rust-android-1.72:
description: "rust repack with android-cross support"
treeherder:
symbol: TL(rust-android)
run:
arguments: [
'--channel', '1.71.0',
'--channel', '1.72.0',
'--host', 'x86_64-unknown-linux-gnu',
'--target', 'x86_64-unknown-linux-gnu',
'--target', 'armv7-linux-androideabi',
@ -199,13 +199,13 @@ linux64-rust-windows-1.65:
]
toolchain-alias: linux64-rust-windows-toolchain
linux64-rust-windows-1.71:
linux64-rust-windows-1.72:
description: "rust repack with windows-cross support"
treeherder:
symbol: TL(rust-win)
run:
arguments: [
'--channel', '1.71.0',
'--channel', '1.72.0',
'--host', 'x86_64-unknown-linux-gnu',
'--target', 'x86_64-unknown-linux-gnu',
'--target', 'x86_64-pc-windows-msvc',
@ -214,12 +214,12 @@ linux64-rust-windows-1.71:
]
toolchain-alias: linux64-rust-windows
win64-rust-1.71:
win64-rust-1.72:
treeherder:
symbol: TW64(rust)
run:
arguments: [
'--channel', '1.71.0',
'--channel', '1.72.0',
'--host', 'x86_64-pc-windows-msvc',
'--target', 'x86_64-pc-windows-msvc',
'--target', 'i686-pc-windows-msvc',
@ -227,23 +227,23 @@ win64-rust-1.71:
]
toolchain-alias: win64-rust
macosx64-rust-1.71:
macosx64-rust-1.72:
treeherder:
symbol: TM(rust)
run:
arguments: [
'--channel', '1.71.0',
'--channel', '1.72.0',
'--host', 'x86_64-apple-darwin',
'--target', 'x86_64-apple-darwin',
]
toolchain-alias: macosx64-rust
mingw32-rust-1.71:
mingw32-rust-1.72:
treeherder:
symbol: TMW(rust)
run:
arguments: [
'--channel', '1.71.0',
'--channel', '1.72.0',
'--host', 'x86_64-unknown-linux-gnu',
'--target', 'i686-unknown-linux-gnu',
'--target', 'i686-pc-windows-gnu',