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.
This commit is contained in:
commit
d8424f6b42
|
@ -583,7 +583,7 @@ jobs:
|
||||||
- name: dist-x86_64-apple
|
- name: dist-x86_64-apple
|
||||||
env:
|
env:
|
||||||
SCRIPT: "./x.py dist"
|
SCRIPT: "./x.py dist"
|
||||||
RUST_CONFIGURE_ARGS: "--target=aarch64-apple-ios,x86_64-apple-ios --enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc"
|
RUST_CONFIGURE_ARGS: "--target=aarch64-apple-ios,x86_64-apple-ios --enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false"
|
||||||
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
|
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
|
||||||
MACOSX_DEPLOYMENT_TARGET: 10.7
|
MACOSX_DEPLOYMENT_TARGET: 10.7
|
||||||
NO_LLVM_ASSERTIONS: 1
|
NO_LLVM_ASSERTIONS: 1
|
||||||
|
@ -594,7 +594,7 @@ jobs:
|
||||||
- name: dist-x86_64-apple-alt
|
- name: dist-x86_64-apple-alt
|
||||||
env:
|
env:
|
||||||
SCRIPT: "./x.py dist"
|
SCRIPT: "./x.py dist"
|
||||||
RUST_CONFIGURE_ARGS: "--enable-extended --enable-profiler --set rust.jemalloc"
|
RUST_CONFIGURE_ARGS: "--enable-extended --enable-profiler --set rust.jemalloc --set llvm.ninja=false"
|
||||||
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
|
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
|
||||||
MACOSX_DEPLOYMENT_TARGET: 10.7
|
MACOSX_DEPLOYMENT_TARGET: 10.7
|
||||||
NO_LLVM_ASSERTIONS: 1
|
NO_LLVM_ASSERTIONS: 1
|
||||||
|
@ -604,7 +604,7 @@ jobs:
|
||||||
- name: x86_64-apple
|
- name: x86_64-apple
|
||||||
env:
|
env:
|
||||||
SCRIPT: "./x.py --stage 2 test"
|
SCRIPT: "./x.py --stage 2 test"
|
||||||
RUST_CONFIGURE_ARGS: "--build=x86_64-apple-darwin --enable-sanitizers --enable-profiler --set rust.jemalloc"
|
RUST_CONFIGURE_ARGS: "--build=x86_64-apple-darwin --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false"
|
||||||
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
|
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
|
||||||
MACOSX_DEPLOYMENT_TARGET: 10.8
|
MACOSX_DEPLOYMENT_TARGET: 10.8
|
||||||
MACOSX_STD_DEPLOYMENT_TARGET: 10.7
|
MACOSX_STD_DEPLOYMENT_TARGET: 10.7
|
||||||
|
|
|
@ -36,6 +36,7 @@ by running `./x.py --help` or reading the [rustc dev guide][rustcguidebuild].
|
||||||
* `python` 3 or 2.7
|
* `python` 3 or 2.7
|
||||||
* GNU `make` 3.81 or later
|
* GNU `make` 3.81 or later
|
||||||
* `cmake` 3.4.3 or later
|
* `cmake` 3.4.3 or later
|
||||||
|
* `ninja`
|
||||||
* `curl`
|
* `curl`
|
||||||
* `git`
|
* `git`
|
||||||
* `ssl` which comes in `libssl-dev` or `openssl-devel`
|
* `ssl` which comes in `libssl-dev` or `openssl-devel`
|
||||||
|
|
|
@ -49,10 +49,8 @@
|
||||||
# dynamic version to be available.
|
# dynamic version to be available.
|
||||||
#static-libstdcpp = false
|
#static-libstdcpp = false
|
||||||
|
|
||||||
# Tell the LLVM build system to use Ninja instead of the platform default for
|
# Whether to use Ninja to build LLVM. This runs much faster than make.
|
||||||
# the generated build system. This can sometimes be faster than make, for
|
#ninja = true
|
||||||
# example.
|
|
||||||
#ninja = false
|
|
||||||
|
|
||||||
# LLVM targets to build support for.
|
# LLVM targets to build support for.
|
||||||
# Note: this is NOT related to Rust compilation targets. However, as Rust is
|
# Note: this is NOT related to Rust compilation targets. However, as Rust is
|
||||||
|
|
|
@ -8,6 +8,7 @@ fn configure(host: &[&str], target: &[&str]) -> Config {
|
||||||
config.save_toolstates = None;
|
config.save_toolstates = None;
|
||||||
config.skip_only_host_steps = false;
|
config.skip_only_host_steps = false;
|
||||||
config.dry_run = true;
|
config.dry_run = true;
|
||||||
|
config.ninja = false;
|
||||||
// try to avoid spurious failures in dist where we create/delete each others file
|
// try to avoid spurious failures in dist where we create/delete each others file
|
||||||
let dir = config
|
let dir = config
|
||||||
.out
|
.out
|
||||||
|
|
|
@ -450,6 +450,7 @@ impl Config {
|
||||||
pub fn default_opts() -> Config {
|
pub fn default_opts() -> Config {
|
||||||
let mut config = Config::default();
|
let mut config = Config::default();
|
||||||
config.llvm_optimize = true;
|
config.llvm_optimize = true;
|
||||||
|
config.ninja = true;
|
||||||
config.llvm_version_check = true;
|
config.llvm_version_check = true;
|
||||||
config.backtrace = true;
|
config.backtrace = true;
|
||||||
config.rust_optimize = true;
|
config.rust_optimize = true;
|
||||||
|
|
|
@ -100,8 +100,16 @@ pub fn check(build: &mut Build) {
|
||||||
if build.config.ninja {
|
if build.config.ninja {
|
||||||
// Some Linux distros rename `ninja` to `ninja-build`.
|
// Some Linux distros rename `ninja` to `ninja-build`.
|
||||||
// CMake can work with either binary name.
|
// CMake can work with either binary name.
|
||||||
if cmd_finder.maybe_have("ninja-build").is_none() {
|
if cmd_finder.maybe_have("ninja-build").is_none()
|
||||||
cmd_finder.must_have("ninja");
|
&& cmd_finder.maybe_have("ninja").is_none()
|
||||||
|
{
|
||||||
|
eprintln!(
|
||||||
|
"
|
||||||
|
Couldn't find required command: ninja
|
||||||
|
You should install ninja, or set ninja=false in config.toml
|
||||||
|
"
|
||||||
|
);
|
||||||
|
std::process::exit(1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -37,7 +37,7 @@ jobs:
|
||||||
# version that we're using, 8.2, cannot compile LLVM for OSX 10.7.
|
# version that we're using, 8.2, cannot compile LLVM for OSX 10.7.
|
||||||
x86_64-apple:
|
x86_64-apple:
|
||||||
SCRIPT: ./x.py --stage 2 test
|
SCRIPT: ./x.py --stage 2 test
|
||||||
INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-apple-darwin --enable-sanitizers --enable-profiler --set rust.jemalloc
|
INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-apple-darwin --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false
|
||||||
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
|
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
|
||||||
MACOSX_DEPLOYMENT_TARGET: 10.8
|
MACOSX_DEPLOYMENT_TARGET: 10.8
|
||||||
MACOSX_STD_DEPLOYMENT_TARGET: 10.7
|
MACOSX_STD_DEPLOYMENT_TARGET: 10.7
|
||||||
|
@ -46,7 +46,7 @@ jobs:
|
||||||
|
|
||||||
dist-x86_64-apple:
|
dist-x86_64-apple:
|
||||||
SCRIPT: ./x.py dist
|
SCRIPT: ./x.py dist
|
||||||
INITIAL_RUST_CONFIGURE_ARGS: --target=aarch64-apple-ios,x86_64-apple-ios --enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc
|
INITIAL_RUST_CONFIGURE_ARGS: --target=aarch64-apple-ios,x86_64-apple-ios --enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false
|
||||||
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
|
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
|
||||||
MACOSX_DEPLOYMENT_TARGET: 10.7
|
MACOSX_DEPLOYMENT_TARGET: 10.7
|
||||||
NO_LLVM_ASSERTIONS: 1
|
NO_LLVM_ASSERTIONS: 1
|
||||||
|
@ -55,7 +55,7 @@ jobs:
|
||||||
|
|
||||||
dist-x86_64-apple-alt:
|
dist-x86_64-apple-alt:
|
||||||
SCRIPT: ./x.py dist
|
SCRIPT: ./x.py dist
|
||||||
INITIAL_RUST_CONFIGURE_ARGS: --enable-extended --enable-profiler --set rust.jemalloc
|
INITIAL_RUST_CONFIGURE_ARGS: --enable-extended --enable-profiler --set rust.jemalloc --set llvm.ninja=false
|
||||||
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
|
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
|
||||||
MACOSX_DEPLOYMENT_TARGET: 10.7
|
MACOSX_DEPLOYMENT_TARGET: 10.7
|
||||||
NO_LLVM_ASSERTIONS: 1
|
NO_LLVM_ASSERTIONS: 1
|
||||||
|
|
|
@ -3,6 +3,7 @@ FROM ubuntu:20.04
|
||||||
RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
|
RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
|
||||||
g++ \
|
g++ \
|
||||||
make \
|
make \
|
||||||
|
ninja-build \
|
||||||
file \
|
file \
|
||||||
curl \
|
curl \
|
||||||
ca-certificates \
|
ca-certificates \
|
||||||
|
|
|
@ -14,6 +14,7 @@ RUN apt-get update -y && apt-get install -y --no-install-recommends \
|
||||||
libc6-dev \
|
libc6-dev \
|
||||||
libc6-dev-armhf-cross \
|
libc6-dev-armhf-cross \
|
||||||
make \
|
make \
|
||||||
|
ninja-build \
|
||||||
python3 \
|
python3 \
|
||||||
qemu-system-arm \
|
qemu-system-arm \
|
||||||
xz-utils
|
xz-utils
|
||||||
|
|
|
@ -3,6 +3,7 @@ FROM ubuntu:16.04
|
||||||
RUN apt-get update && apt-get install -y --no-install-recommends \
|
RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||||
g++ \
|
g++ \
|
||||||
make \
|
make \
|
||||||
|
ninja-build \
|
||||||
file \
|
file \
|
||||||
curl \
|
curl \
|
||||||
ca-certificates \
|
ca-certificates \
|
||||||
|
|
|
@ -3,6 +3,7 @@ FROM ubuntu:16.04
|
||||||
RUN apt-get update && apt-get install -y --no-install-recommends \
|
RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||||
g++ \
|
g++ \
|
||||||
make \
|
make \
|
||||||
|
ninja-build \
|
||||||
file \
|
file \
|
||||||
curl \
|
curl \
|
||||||
ca-certificates \
|
ca-certificates \
|
||||||
|
|
|
@ -3,6 +3,7 @@ FROM ubuntu:16.04
|
||||||
RUN apt-get update && apt-get install -y --no-install-recommends \
|
RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||||
g++ \
|
g++ \
|
||||||
make \
|
make \
|
||||||
|
ninja-build \
|
||||||
file \
|
file \
|
||||||
curl \
|
curl \
|
||||||
ca-certificates \
|
ca-certificates \
|
||||||
|
|
|
@ -3,6 +3,7 @@ FROM ubuntu:16.04
|
||||||
RUN apt-get update && apt-get install -y --no-install-recommends \
|
RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||||
g++ \
|
g++ \
|
||||||
make \
|
make \
|
||||||
|
ninja-build \
|
||||||
file \
|
file \
|
||||||
curl \
|
curl \
|
||||||
ca-certificates \
|
ca-certificates \
|
||||||
|
|
|
@ -16,6 +16,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||||
libcurl4-openssl-dev \
|
libcurl4-openssl-dev \
|
||||||
libssl-dev \
|
libssl-dev \
|
||||||
make \
|
make \
|
||||||
|
ninja-build \
|
||||||
nasm \
|
nasm \
|
||||||
pkg-config \
|
pkg-config \
|
||||||
python3 \
|
python3 \
|
||||||
|
|
|
@ -20,6 +20,7 @@ RUN apt-get update -y && apt-get install -y --no-install-recommends \
|
||||||
libc6-dev \
|
libc6-dev \
|
||||||
libc6-dev-riscv64-cross \
|
libc6-dev-riscv64-cross \
|
||||||
make \
|
make \
|
||||||
|
ninja-build \
|
||||||
patch \
|
patch \
|
||||||
python3 \
|
python3 \
|
||||||
qemu-system-misc \
|
qemu-system-misc \
|
||||||
|
|
|
@ -3,6 +3,7 @@ FROM ubuntu:16.04
|
||||||
RUN apt-get update && apt-get install -y --no-install-recommends \
|
RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||||
g++-multilib \
|
g++-multilib \
|
||||||
make \
|
make \
|
||||||
|
ninja-build \
|
||||||
file \
|
file \
|
||||||
curl \
|
curl \
|
||||||
ca-certificates \
|
ca-certificates \
|
||||||
|
|
|
@ -3,6 +3,7 @@ FROM ubuntu:18.04
|
||||||
RUN apt-get update && apt-get install -y --no-install-recommends \
|
RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||||
clang \
|
clang \
|
||||||
make \
|
make \
|
||||||
|
ninja-build \
|
||||||
file \
|
file \
|
||||||
curl \
|
curl \
|
||||||
ca-certificates \
|
ca-certificates \
|
||||||
|
|
|
@ -93,6 +93,7 @@ ENV RUST_CONFIGURE_ARGS \
|
||||||
--enable-profiler \
|
--enable-profiler \
|
||||||
--set target.i686-unknown-linux-gnu.linker=clang \
|
--set target.i686-unknown-linux-gnu.linker=clang \
|
||||||
--build=i686-unknown-linux-gnu \
|
--build=i686-unknown-linux-gnu \
|
||||||
|
--set llvm.ninja=false \
|
||||||
--set rust.jemalloc
|
--set rust.jemalloc
|
||||||
ENV SCRIPT python2.7 ../x.py dist --build $HOSTS --host $HOSTS --target $HOSTS
|
ENV SCRIPT python2.7 ../x.py dist --build $HOSTS --host $HOSTS --target $HOSTS
|
||||||
ENV CARGO_TARGET_I686_UNKNOWN_LINUX_GNU_LINKER=clang
|
ENV CARGO_TARGET_I686_UNKNOWN_LINUX_GNU_LINKER=clang
|
||||||
|
|
|
@ -3,6 +3,7 @@ FROM ubuntu:16.04
|
||||||
RUN apt-get update && apt-get install -y --no-install-recommends \
|
RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||||
g++ \
|
g++ \
|
||||||
make \
|
make \
|
||||||
|
ninja-build \
|
||||||
file \
|
file \
|
||||||
curl \
|
curl \
|
||||||
ca-certificates \
|
ca-certificates \
|
||||||
|
|
|
@ -3,6 +3,7 @@ FROM ubuntu:16.04
|
||||||
RUN apt-get update && apt-get install -y --no-install-recommends \
|
RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||||
g++ \
|
g++ \
|
||||||
make \
|
make \
|
||||||
|
ninja-build \
|
||||||
file \
|
file \
|
||||||
curl \
|
curl \
|
||||||
ca-certificates \
|
ca-certificates \
|
||||||
|
|
|
@ -3,6 +3,7 @@ FROM ubuntu:16.04
|
||||||
RUN apt-get update && apt-get install -y --no-install-recommends \
|
RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||||
g++ \
|
g++ \
|
||||||
make \
|
make \
|
||||||
|
ninja-build \
|
||||||
file \
|
file \
|
||||||
curl \
|
curl \
|
||||||
ca-certificates \
|
ca-certificates \
|
||||||
|
|
|
@ -3,6 +3,7 @@ FROM ubuntu:16.04
|
||||||
RUN apt-get update && apt-get install -y --no-install-recommends \
|
RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||||
g++ \
|
g++ \
|
||||||
make \
|
make \
|
||||||
|
ninja-build \
|
||||||
file \
|
file \
|
||||||
curl \
|
curl \
|
||||||
ca-certificates \
|
ca-certificates \
|
||||||
|
|
|
@ -15,6 +15,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||||
libncurses-dev \
|
libncurses-dev \
|
||||||
gawk \
|
gawk \
|
||||||
make \
|
make \
|
||||||
|
ninja-build \
|
||||||
file \
|
file \
|
||||||
curl \
|
curl \
|
||||||
ca-certificates \
|
ca-certificates \
|
||||||
|
|
|
@ -16,6 +16,7 @@ apt-get install -y --no-install-recommends \
|
||||||
git \
|
git \
|
||||||
lld-5.0 \
|
lld-5.0 \
|
||||||
make \
|
make \
|
||||||
|
ninja-build \
|
||||||
python \
|
python \
|
||||||
sudo \
|
sudo \
|
||||||
xz-utils
|
xz-utils
|
||||||
|
|
|
@ -3,6 +3,7 @@ FROM ubuntu:18.04
|
||||||
RUN apt-get update && apt-get install -y --no-install-recommends \
|
RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||||
clang \
|
clang \
|
||||||
make \
|
make \
|
||||||
|
ninja-build \
|
||||||
file \
|
file \
|
||||||
curl \
|
curl \
|
||||||
ca-certificates \
|
ca-certificates \
|
||||||
|
|
|
@ -96,6 +96,7 @@ ENV RUST_CONFIGURE_ARGS \
|
||||||
--set target.x86_64-unknown-linux-gnu.ar=/rustroot/bin/llvm-ar \
|
--set target.x86_64-unknown-linux-gnu.ar=/rustroot/bin/llvm-ar \
|
||||||
--set target.x86_64-unknown-linux-gnu.ranlib=/rustroot/bin/llvm-ranlib \
|
--set target.x86_64-unknown-linux-gnu.ranlib=/rustroot/bin/llvm-ranlib \
|
||||||
--set llvm.thin-lto=true \
|
--set llvm.thin-lto=true \
|
||||||
|
--set llvm.ninja=false \
|
||||||
--set rust.jemalloc
|
--set rust.jemalloc
|
||||||
ENV SCRIPT python2.7 ../x.py dist --host $HOSTS --target $HOSTS
|
ENV SCRIPT python2.7 ../x.py dist --host $HOSTS --target $HOSTS
|
||||||
ENV CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_LINKER=clang
|
ENV CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_LINKER=clang
|
||||||
|
|
|
@ -3,6 +3,7 @@ FROM ubuntu:16.04
|
||||||
RUN apt-get update && apt-get install -y --no-install-recommends \
|
RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||||
g++ \
|
g++ \
|
||||||
make \
|
make \
|
||||||
|
ninja-build \
|
||||||
file \
|
file \
|
||||||
wget \
|
wget \
|
||||||
curl \
|
curl \
|
||||||
|
|
|
@ -3,6 +3,7 @@ FROM ubuntu:16.04
|
||||||
RUN apt-get update && apt-get install -y --no-install-recommends \
|
RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||||
g++-multilib \
|
g++-multilib \
|
||||||
make \
|
make \
|
||||||
|
ninja-build \
|
||||||
file \
|
file \
|
||||||
curl \
|
curl \
|
||||||
ca-certificates \
|
ca-certificates \
|
||||||
|
|
|
@ -3,6 +3,7 @@ FROM ubuntu:16.04
|
||||||
RUN apt-get update && apt-get install -y --no-install-recommends \
|
RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||||
g++-multilib \
|
g++-multilib \
|
||||||
make \
|
make \
|
||||||
|
ninja-build \
|
||||||
file \
|
file \
|
||||||
curl \
|
curl \
|
||||||
ca-certificates \
|
ca-certificates \
|
||||||
|
|
|
@ -3,6 +3,7 @@ FROM ubuntu:18.04
|
||||||
RUN apt-get update && apt-get install -y --no-install-recommends \
|
RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||||
g++ \
|
g++ \
|
||||||
make \
|
make \
|
||||||
|
ninja-build \
|
||||||
file \
|
file \
|
||||||
curl \
|
curl \
|
||||||
ca-certificates \
|
ca-certificates \
|
||||||
|
|
|
@ -3,6 +3,7 @@ FROM ubuntu:18.04
|
||||||
RUN apt-get update && apt-get install -y --no-install-recommends \
|
RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||||
g++ \
|
g++ \
|
||||||
make \
|
make \
|
||||||
|
ninja-build \
|
||||||
file \
|
file \
|
||||||
curl \
|
curl \
|
||||||
ca-certificates \
|
ca-certificates \
|
||||||
|
|
|
@ -3,6 +3,7 @@ FROM ubuntu:16.04
|
||||||
RUN apt-get update && apt-get install -y --no-install-recommends \
|
RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||||
g++ \
|
g++ \
|
||||||
make \
|
make \
|
||||||
|
ninja-build \
|
||||||
file \
|
file \
|
||||||
curl \
|
curl \
|
||||||
ca-certificates \
|
ca-certificates \
|
||||||
|
|
|
@ -3,6 +3,7 @@ FROM ubuntu:16.04
|
||||||
RUN apt-get update && apt-get install -y --no-install-recommends \
|
RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||||
g++ \
|
g++ \
|
||||||
make \
|
make \
|
||||||
|
ninja-build \
|
||||||
file \
|
file \
|
||||||
curl \
|
curl \
|
||||||
ca-certificates \
|
ca-certificates \
|
||||||
|
|
|
@ -3,6 +3,7 @@ FROM ubuntu:19.10
|
||||||
RUN apt-get update && apt-get install -y --no-install-recommends \
|
RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||||
g++ \
|
g++ \
|
||||||
make \
|
make \
|
||||||
|
ninja-build \
|
||||||
file \
|
file \
|
||||||
curl \
|
curl \
|
||||||
ca-certificates \
|
ca-certificates \
|
||||||
|
|
|
@ -3,6 +3,7 @@ FROM ubuntu:16.04
|
||||||
RUN apt-get update && apt-get install -y --no-install-recommends \
|
RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||||
g++ \
|
g++ \
|
||||||
make \
|
make \
|
||||||
|
ninja-build \
|
||||||
file \
|
file \
|
||||||
curl \
|
curl \
|
||||||
ca-certificates \
|
ca-certificates \
|
||||||
|
|
|
@ -4,6 +4,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||||
g++ \
|
g++ \
|
||||||
g++-arm-linux-gnueabi \
|
g++-arm-linux-gnueabi \
|
||||||
make \
|
make \
|
||||||
|
ninja-build \
|
||||||
file \
|
file \
|
||||||
curl \
|
curl \
|
||||||
ca-certificates \
|
ca-certificates \
|
||||||
|
|
|
@ -3,6 +3,7 @@ FROM ubuntu:16.04
|
||||||
RUN apt-get update && apt-get install -y --no-install-recommends \
|
RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||||
g++ \
|
g++ \
|
||||||
make \
|
make \
|
||||||
|
ninja-build \
|
||||||
file \
|
file \
|
||||||
curl \
|
curl \
|
||||||
ca-certificates \
|
ca-certificates \
|
||||||
|
|
|
@ -3,6 +3,7 @@ FROM ubuntu:16.04
|
||||||
RUN apt-get update && apt-get install -y --no-install-recommends \
|
RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||||
g++ \
|
g++ \
|
||||||
make \
|
make \
|
||||||
|
ninja-build \
|
||||||
file \
|
file \
|
||||||
curl \
|
curl \
|
||||||
ca-certificates \
|
ca-certificates \
|
||||||
|
|
|
@ -3,6 +3,7 @@ FROM ubuntu:19.10
|
||||||
RUN apt-get update && apt-get install -y --no-install-recommends \
|
RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||||
g++ \
|
g++ \
|
||||||
make \
|
make \
|
||||||
|
ninja-build \
|
||||||
file \
|
file \
|
||||||
curl \
|
curl \
|
||||||
ca-certificates \
|
ca-certificates \
|
||||||
|
|
|
@ -10,6 +10,7 @@ apt-get install -y --no-install-recommends \
|
||||||
git \
|
git \
|
||||||
libssl-dev \
|
libssl-dev \
|
||||||
make \
|
make \
|
||||||
|
ninja-build \
|
||||||
pkg-config \
|
pkg-config \
|
||||||
python3 \
|
python3 \
|
||||||
sudo \
|
sudo \
|
||||||
|
|
|
@ -17,6 +17,7 @@ apt-get update && apt-get install -y --no-install-recommends \
|
||||||
libssl-dev \
|
libssl-dev \
|
||||||
libtool-bin \
|
libtool-bin \
|
||||||
make \
|
make \
|
||||||
|
ninja-build \
|
||||||
patch \
|
patch \
|
||||||
pkg-config \
|
pkg-config \
|
||||||
python3 \
|
python3 \
|
||||||
|
|
|
@ -605,7 +605,7 @@ jobs:
|
||||||
- name: dist-x86_64-apple
|
- name: dist-x86_64-apple
|
||||||
env:
|
env:
|
||||||
SCRIPT: ./x.py dist
|
SCRIPT: ./x.py dist
|
||||||
RUST_CONFIGURE_ARGS: --target=aarch64-apple-ios,x86_64-apple-ios --enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc
|
RUST_CONFIGURE_ARGS: --target=aarch64-apple-ios,x86_64-apple-ios --enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false
|
||||||
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
|
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
|
||||||
MACOSX_DEPLOYMENT_TARGET: 10.7
|
MACOSX_DEPLOYMENT_TARGET: 10.7
|
||||||
NO_LLVM_ASSERTIONS: 1
|
NO_LLVM_ASSERTIONS: 1
|
||||||
|
@ -620,7 +620,7 @@ jobs:
|
||||||
- name: dist-x86_64-apple-alt
|
- name: dist-x86_64-apple-alt
|
||||||
env:
|
env:
|
||||||
SCRIPT: ./x.py dist
|
SCRIPT: ./x.py dist
|
||||||
RUST_CONFIGURE_ARGS: --enable-extended --enable-profiler --set rust.jemalloc
|
RUST_CONFIGURE_ARGS: --enable-extended --enable-profiler --set rust.jemalloc --set llvm.ninja=false
|
||||||
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
|
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
|
||||||
MACOSX_DEPLOYMENT_TARGET: 10.7
|
MACOSX_DEPLOYMENT_TARGET: 10.7
|
||||||
NO_LLVM_ASSERTIONS: 1
|
NO_LLVM_ASSERTIONS: 1
|
||||||
|
@ -634,7 +634,7 @@ jobs:
|
||||||
- name: x86_64-apple
|
- name: x86_64-apple
|
||||||
env:
|
env:
|
||||||
SCRIPT: ./x.py --stage 2 test
|
SCRIPT: ./x.py --stage 2 test
|
||||||
RUST_CONFIGURE_ARGS: --build=x86_64-apple-darwin --enable-sanitizers --enable-profiler --set rust.jemalloc
|
RUST_CONFIGURE_ARGS: --build=x86_64-apple-darwin --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false
|
||||||
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
|
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
|
||||||
MACOSX_DEPLOYMENT_TARGET: 10.8
|
MACOSX_DEPLOYMENT_TARGET: 10.8
|
||||||
MACOSX_STD_DEPLOYMENT_TARGET: 10.7
|
MACOSX_STD_DEPLOYMENT_TARGET: 10.7
|
||||||
|
|
Loading…
Reference in New Issue