Bug 1708592 - Package clippy in the rust toolchain artifact. r=firefox-build-system-reviewers,mhentges

Differential Revision: https://phabricator.services.mozilla.com/D113903
This commit is contained in:
Mike Hommey 2021-04-30 21:09:11 +00:00
Родитель f2dcdd5390
Коммит 2badf48dc0
1 изменённых файлов: 5 добавлений и 2 удалений

Просмотреть файл

@ -307,7 +307,7 @@ def fetch_manifest(channel="stable", host=None, targets=()):
"available": requests.head(url).status_code == 200, "available": requests.head(url).status_code == 200,
} }
for pkg in ("cargo", "rustc", "rustfmt-preview"): for pkg in ("cargo", "rustc", "rustfmt-preview", "clippy-preview"):
manifest["pkg"][pkg] = { manifest["pkg"][pkg] = {
"version": "bors", "version": "bors",
"target": { "target": {
@ -395,7 +395,7 @@ def build_src(install_dir, host, targets, patch):
""" """
[build] [build]
extended = true extended = true
tools = ["analysis", "cargo", "rustfmt", "src"] tools = ["analysis", "cargo", "rustfmt", "clippy", "src"]
[install] [install]
prefix = "{prefix}" prefix = "{prefix}"
@ -485,6 +485,7 @@ def repack(
stds = fetch_std(manifest, targets) stds = fetch_std(manifest, targets)
rustsrc = fetch_package(manifest, "rust-src", host) rustsrc = fetch_package(manifest, "rust-src", host)
rustfmt = fetch_optional(manifest, "rustfmt-preview", host) rustfmt = fetch_optional(manifest, "rustfmt-preview", host)
clippy = fetch_optional(manifest, "clippy-preview", host)
log("Installing packages...") log("Installing packages...")
@ -499,6 +500,8 @@ def repack(
install(os.path.basename(rustsrc["url"]), install_dir) install(os.path.basename(rustsrc["url"]), install_dir)
if rustfmt: if rustfmt:
install(os.path.basename(rustfmt["url"]), install_dir) install(os.path.basename(rustfmt["url"]), install_dir)
if clippy:
install(os.path.basename(clippy["url"]), install_dir)
for std in stds: for std in stds:
install(os.path.basename(std["url"]), install_dir) install(os.path.basename(std["url"]), install_dir)
pass pass