Bug 1391427 - Use toolchain rust for macOS builds.
Make use of the toolchain task's packaged rust builds for
linux-hosted cross-macos builds of Firefox.
Add a macOS target to the linux64-rust taskcluster artifact.
Remove the corresponding rust entry from the cross-releng
tooltool manifest.
MozReview-Commit-ID: 9XgkSvZsWBq
--- a/browser/config/tooltool-manifests/macosx64/cross-releng.manifest
+++ b/browser/config/tooltool-manifests/macosx64/cross-releng.manifest
@@ -1,18 +1,10 @@
[
{
"size": 34094283,
"visibility": "internal",
"digest": "8811050fe375bcc566c8b85173d86b8a87aa2148edfed93023735c2de44b66a5a28cbaa1cfd396032447fd803e03f308ed941a200c0e2a1ad9fbe16b5606ee7c",
"algorithm": "sha512",
"unpack": true,
"filename": "MacOSX10.11.sdk.tar.xz"
- },
- {
- "version": "rustc 1.19.0 (0ade33941 2017-07-17) repack",
- "size": 155690216,
- "digest": "379f542ea16c775e7bcad36823f0068ca6a1f17c2b25e42ef978d51865298ba4207dc89bbb614805f81a123d12e339209a447afbd12c1122e16f4c7c41e7d92b",
- "algorithm": "sha512",
- "filename": "rustc.tar.xz",
- "unpack": true
}
]
--- a/taskcluster/ci/build/macosx.yml
+++ b/taskcluster/ci/build/macosx.yml
@@ -21,16 +21,17 @@ macosx64/debug:
secrets: true
custom-build-variant-cfg: cross-debug
tooltool-downloads: internal
toolchains:
- linux64-cctools-port
- linux64-clang
- linux64-hfsplus
- linux64-libdmg
+ - linux64-rust
- linux64-sccache
macosx64/opt:
description: "MacOS X x64 Cross-compile"
index:
product: firefox
job-name: macosx64-opt
treeherder:
@@ -50,16 +51,17 @@ macosx64/opt:
script: "mozharness/scripts/fx_desktop_build.py"
secrets: true
tooltool-downloads: internal
toolchains:
- linux64-cctools-port
- linux64-clang
- linux64-hfsplus
- linux64-libdmg
+ - linux64-rust
- linux64-sccache
macosx64-dmd/opt:
description: "MacOS X x64 DMD Cross-compile"
index:
product: firefox
job-name: macosx64-dmd-opt
treeherder:
@@ -81,16 +83,17 @@ macosx64-dmd/opt:
secrets: true
tooltool-downloads: internal
run-on-projects: [ ]
toolchains:
- linux64-cctools-port
- linux64-clang
- linux64-hfsplus
- linux64-libdmg
+ - linux64-rust
- linux64-sccache
macosx64-devedition-nightly/opt:
description: "MacOS X Dev Edition x64 Nightly"
attributes:
nightly: true
index:
product: devedition
@@ -117,16 +120,17 @@ macosx64-devedition-nightly/opt:
tooltool-downloads: internal
custom-build-variant-cfg: devedition
run-on-projects: ['mozilla-beta',]
toolchains:
- linux64-cctools-port
- linux64-clang
- linux64-hfsplus
- linux64-libdmg
+ - linux64-rust
- linux64-sccache
macosx64-noopt/debug:
description: "MacOS X x64 No-optimize Debug"
index:
product: firefox
job-name: macosx64-noopt-debug
treeherder:
@@ -151,16 +155,17 @@ macosx64-noopt/debug:
tooltool-downloads: internal
keep-artifacts: false
run-on-projects: [ 'trunk', 'try' ]
toolchains:
- linux64-cctools-port
- linux64-clang
- linux64-hfsplus
- linux64-libdmg
+ - linux64-rust
- linux64-sccache
macosx64-add-on-devel/opt:
description: "MacOS X x64 add-on-devel"
index:
product: firefox
job-name: macosx64-add-on-devel
treeherder:
@@ -183,16 +188,17 @@ macosx64-add-on-devel/opt:
custom-build-variant-cfg: add-on-devel
tooltool-downloads: internal
run-on-projects: [ 'mozilla-beta', 'mozilla-release', 'mozilla-esr45' ]
toolchains:
- linux64-cctools-port
- linux64-clang
- linux64-hfsplus
- linux64-libdmg
+ - linux64-rust
- linux64-sccache
macosx64-nightly/opt:
description: "MacOS X x64 Cross-compile Nightly"
attributes:
nightly: true
index:
product: firefox
@@ -217,9 +223,10 @@ macosx64-nightly/opt:
script: "mozharness/scripts/fx_desktop_build.py"
secrets: true
tooltool-downloads: internal
toolchains:
- linux64-cctools-port
- linux64-clang
- linux64-hfsplus
- linux64-libdmg
+ - linux64-rust
- linux64-sccache
--- a/taskcluster/ci/toolchain/linux.yml
+++ b/taskcluster/ci/toolchain/linux.yml
@@ -200,16 +200,17 @@ linux64-rust:
UPLOAD_DIR: artifacts
run:
using: toolchain-script
script: repack_rust.py
arguments: >
--channel 1.19.0
--host linux64
--target linux64 --target linux32
+ --target x86_64-apple-darwin
toolchain-artifact: public/build/rustc-x86_64-unknown-linux-gnu-repack.tar.xz
linux64-sccache:
description: "sccache toolchain build"
treeherder:
kind: build
platform: toolchains/opt
symbol: TL(sccache)