nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-06-06 04:08:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Debian 6 doesn't have ninja, so use make for the dist builds

Browse Source
This commit is contained in:
Josh Triplett 2020-08-26 15:24:39 -07:00
parent bb39f3555c
commit f758c7b2a7
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ci/docker/host-x86_64/dist-i686-linux/Dockerfile
View File

@ -26,7 +26,6 @@ RUN apt-get update && \
libedit-dev \ libedit-dev \
libncurses-dev \ libncurses-dev \
make \ make \
ninja-build \
patch \ patch \
perl \ perl \
pkg-config \ pkg-config \
@ -94,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

2
src/ci/docker/host-x86_64/dist-x86_64-linux/Dockerfile
View File

@ -26,7 +26,6 @@ RUN apt-get update && \
libedit-dev \ libedit-dev \
libncurses-dev \ libncurses-dev \
make \ make \
ninja-build \
patch \ patch \
perl \ perl \
pkg-config \ 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.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