Commit c73bd5d5 authored by Nathan Froyd's avatar Nathan Froyd
Browse files

Bug 1554286 - move Mac builds to Rust 1.36-beta; r=chmanchester

We would like to switch to using cross-language LTO on all of our
platforms, and we need to use a beta version of Rust on Mac to do that.

Differential Revision: https://phabricator.services.mozilla.com/D33316

--HG--
extra : moz-landing-system : lando
parent 88c97349
......@@ -35,5 +35,5 @@ rustc-dist-toolchain:
arguments: ['rustc']
toolchain-artifact: public/build/rustc-dist-toolchain.tar.xz
toolchains:
- linux64-rust-macos-1.35
- linux64-rust-macos-1.36
- linux64-sccache
......@@ -120,13 +120,13 @@ linux64-rust-macos-1.34:
'--target', 'x86_64-apple-darwin',
]
linux64-rust-macos-1.35:
linux64-rust-macos-1.36:
description: "rust repack with macos-cross support"
treeherder:
symbol: TL(rust-macos)
run:
arguments: [
'--channel', '1.35.0',
'--channel', 'beta-2019-05-30',
'--host', 'x86_64-unknown-linux-gnu',
'--target', 'x86_64-unknown-linux-gnu',
'--target', 'x86_64-apple-darwin',
......
......@@ -5,7 +5,7 @@ use rustc_version::{version, Version};
fn main() {
let ver = version().unwrap();
let mut bootstrap = false;
let max_oom_hook_version = Version::parse("1.36.0-alpha").unwrap();
let max_oom_hook_version = Version::parse("1.37.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\"");
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment