diff options
| author | bors <bors@rust-lang.org> | 2020-08-29 06:08:37 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-08-29 06:08:37 +0000 |
| commit | d8424f6b426f91ae39dbeacd631a82aad5d733f4 (patch) | |
| tree | 2cc658ad4c12c81cf1680608e01c5e5a3934048c /src/ci/docker/scripts | |
| parent | 17fb1254b8f085c0787cc8f11ac466fcc2d8c488 (diff) | |
| parent | 8b501e33e5b873b66bc421cc142d4c7430d8f005 (diff) | |
| download | rust-d8424f6b426f91ae39dbeacd631a82aad5d733f4.tar.gz rust-d8424f6b426f91ae39dbeacd631a82aad5d733f4.zip | |
Auto merge of #74922 - joshtriplett:ninja-by-default, r=Mark-Simulacrum
Set ninja=true by default Ninja substantially improves LLVM build time. On a 96-way system, using Make took 248s, and using Ninja took 161s, a 35% improvement. We already require a variety of tools to build Rust. If someone wants to build without Ninja (for instance, to minimize the set of packages required to bootstrap a new target), they can easily set `ninja=false` in `config.toml`. Our defaults should help people build Rust (and LLVM) faster, to speed up development.
Diffstat (limited to 'src/ci/docker/scripts')
| -rw-r--r-- | src/ci/docker/scripts/android-base-apt-get.sh | 1 | ||||
| -rw-r--r-- | src/ci/docker/scripts/cross-apt-packages.sh | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/ci/docker/scripts/android-base-apt-get.sh b/src/ci/docker/scripts/android-base-apt-get.sh index 391b68ea637..1795b1696d3 100644 --- a/src/ci/docker/scripts/android-base-apt-get.sh +++ b/src/ci/docker/scripts/android-base-apt-get.sh @@ -10,6 +10,7 @@ apt-get install -y --no-install-recommends \ git \ libssl-dev \ make \ + ninja-build \ pkg-config \ python3 \ sudo \ diff --git a/src/ci/docker/scripts/cross-apt-packages.sh b/src/ci/docker/scripts/cross-apt-packages.sh index 7030cd74cae..2de376443ad 100644 --- a/src/ci/docker/scripts/cross-apt-packages.sh +++ b/src/ci/docker/scripts/cross-apt-packages.sh @@ -17,6 +17,7 @@ apt-get update && apt-get install -y --no-install-recommends \ libssl-dev \ libtool-bin \ make \ + ninja-build \ patch \ pkg-config \ python3 \ |