Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-01-22 11:57:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1564638 - Update Linux to Rust beta 1.37. r=froydnj

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D37775

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Eric Rahm 2019-07-24 20:53:33 +00:00
parent 95905e3b77
commit 59cad35d42
3 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
taskcluster/ci/toolchain/misc.yml
View File

@ -143,4 +143,4 @@ wrench-deps:
- 'taskcluster/scripts/misc/tooltool-download.sh'
toolchain-artifact: public/build/wrench-deps.tar.bz2
toolchains:
- linux64-rust-1.36 # whatever m-c is built with
- linux64-rust-1.37 # whatever m-c is built with

14
taskcluster/ci/toolchain/rust.yml
View File

@ -73,7 +73,7 @@ linux64-rust-1.35:
linux64-rust-1.36:
treeherder:
symbol: TL(rust)
symbol: TL(rust-1.36)
run:
arguments: [
'--channel', '1.36.0',
@ -82,6 +82,18 @@ linux64-rust-1.36:
'--target', 'i686-unknown-linux-gnu',
'--target', 'aarch64-unknown-linux-gnu',
]
linux64-rust-1.37:
treeherder:
symbol: TL(rust)
run:
arguments: [
'--channel', 'beta-2019-07-23',
'--host', 'x86_64-unknown-linux-gnu',
'--target', 'x86_64-unknown-linux-gnu',
'--target', 'i686-unknown-linux-gnu',
'--target', 'aarch64-unknown-linux-gnu',
]
toolchain-alias: linux64-rust
linux64-rust-nightly:

2
toolkit/library/rust/shared/build.rs
View File

@ -9,7 +9,7 @@ use rustc_version::{version, Version};
fn main() {
let ver = version().unwrap();
let mut bootstrap = false;
let max_oom_hook_version = Version::parse("1.37.0-alpha").unwrap();
let max_oom_hook_version = Version::parse("1.38.0-alpha").unwrap();
if ver >= Version::parse("1.28.0-alpha").unwrap() && ver < max_oom_hook_version {
println!("cargo:rustc-cfg=feature=\"oom_with_hook\"");