summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2020-10-21 09:09:49 +0000
committerbors <bors@rust-lang.org>2020-10-21 09:09:49 +0000
commit4c78178b1c6ee26e493edb58cefaa77ca44e3991 (patch)
tree827694e658b864b50e9878bd988c07b941477ee1
parentAuto merge of #78141 - pietroalbini:beta-rollup, r=pietroalbini (diff)
parentDisable ThinLTO for x86_64-unknown-linux-gnu (diff)
downloadrust-beta.tar.gz
rust-beta.tar.bz2
rust-beta.tar.xz
Auto merge of #78148 - Mark-Simulacrum:beta-76980, r=pietroalbinibeta
[beta] Disable ThinLTO for x86_64-unknown-linux-gnu Temporarily addresses #76980 for 1.48 release. r? `@pietroalbini`
-rw-r--r--src/ci/docker/host-x86_64/dist-x86_64-linux/Dockerfile2
1 files changed, 1 insertions, 1 deletions
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 14700ae..f5c4d63 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
@@ -95,7 +95,7 @@ ENV RUST_CONFIGURE_ARGS \
95 --set target.x86_64-unknown-linux-gnu.linker=clang \ 95 --set target.x86_64-unknown-linux-gnu.linker=clang \
96 --set target.x86_64-unknown-linux-gnu.ar=/rustroot/bin/llvm-ar \ 96 --set target.x86_64-unknown-linux-gnu.ar=/rustroot/bin/llvm-ar \
97 --set target.x86_64-unknown-linux-gnu.ranlib=/rustroot/bin/llvm-ranlib \ 97 --set target.x86_64-unknown-linux-gnu.ranlib=/rustroot/bin/llvm-ranlib \
98 --set llvm.thin-lto=true \ 98 --set llvm.thin-lto=false \
99 --set llvm.ninja=false \ 99 --set llvm.ninja=false \
100 --set rust.jemalloc 100 --set rust.jemalloc
101ENV SCRIPT python2.7 ../x.py dist --host $HOSTS --target $HOSTS \ 101ENV SCRIPT python2.7 ../x.py dist --host $HOSTS --target $HOSTS \