diff options
| author | Josh Triplett <josh@joshtriplett.org> | 2020-08-26 15:24:39 -0700 |
|---|---|---|
| committer | Josh Triplett <josh@joshtriplett.org> | 2020-08-26 20:18:27 -0700 |
| commit | f758c7b2a7845871fffb6d81fa1193de5f4d46b7 (patch) | |
| tree | 30243bcae3b3a616da5b0f24e0a477134c56973a /src/ci/docker | |
| parent | bb39f3555c14275472386ffca637071e22714521 (diff) | |
| download | rust-f758c7b2a7845871fffb6d81fa1193de5f4d46b7.tar.gz rust-f758c7b2a7845871fffb6d81fa1193de5f4d46b7.zip | |
Debian 6 doesn't have ninja, so use make for the dist builds
Diffstat (limited to 'src/ci/docker')
| -rw-r--r-- | src/ci/docker/host-x86_64/dist-i686-linux/Dockerfile | 2 | ||||
| -rw-r--r-- | src/ci/docker/host-x86_64/dist-x86_64-linux/Dockerfile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/ci/docker/host-x86_64/dist-i686-linux/Dockerfile b/src/ci/docker/host-x86_64/dist-i686-linux/Dockerfile index d4ee7a94140..22d7cbb0d14 100644 --- a/src/ci/docker/host-x86_64/dist-i686-linux/Dockerfile +++ b/src/ci/docker/host-x86_64/dist-i686-linux/Dockerfile @@ -26,7 +26,6 @@ RUN apt-get update && \ libedit-dev \ libncurses-dev \ make \ - ninja-build \ patch \ perl \ pkg-config \ @@ -94,6 +93,7 @@ ENV RUST_CONFIGURE_ARGS \ --enable-profiler \ --set target.i686-unknown-linux-gnu.linker=clang \ --build=i686-unknown-linux-gnu \ + --set llvm.ninja=false \ --set rust.jemalloc ENV SCRIPT python2.7 ../x.py dist --build $HOSTS --host $HOSTS --target $HOSTS ENV CARGO_TARGET_I686_UNKNOWN_LINUX_GNU_LINKER=clang diff --git a/src/ci/docker/host-x86_64/dist-x86_64-linux/Dockerfile b/src/ci/docker/host-x86_64/dist-x86_64-linux/Dockerfile index 1c9a3f5022f..58e2567a58f 100644 --- a/src/ci/docker/host-x86_64/dist-x86_64-linux/Dockerfile +++ b/src/ci/docker/host-x86_64/dist-x86_64-linux/Dockerfile @@ -26,7 +26,6 @@ RUN apt-get update && \ libedit-dev \ libncurses-dev \ make \ - ninja-build \ patch \ perl \ pkg-config \ @@ -97,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.ranlib=/rustroot/bin/llvm-ranlib \ --set llvm.thin-lto=true \ + --set llvm.ninja=false \ --set rust.jemalloc ENV SCRIPT python2.7 ../x.py dist --host $HOSTS --target $HOSTS ENV CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_LINKER=clang |