diff options
| author | bors <bors@rust-lang.org> | 2020-10-07 07:52:19 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-10-07 07:52:19 +0000 |
| commit | 18bf6b4f01a6feaf7259ba7cdae58031af1b7b39 (patch) | |
| tree | 638bb1e3e2b40cb3eae11d16208044c885d0f261 | |
| parent | 90ed0a896d7d334dd5dc516b309665312e4a1158 (diff) | |
| parent | b4c560a7aaf0977b3f5376fe102d8672388d9b91 (diff) | |
Auto merge of #77642 - pietroalbini:stable-next, r=pietroalbini1.47.0
Rust 1.47.0 stable release, take 2
This PR adds a workaround for https://github.com/rust-lang/rust/issues/76980 to the existing stable 1.47.0 branch. I will invalidate the dev artifacts and issue another pre-release once the PR is merged, to let people test this change.
r? `@ghost`
| -rw-r--r-- | RELEASES.md | 2 | ||||
| -rw-r--r-- | src/ci/docker/host-x86_64/dist-x86_64-linux/Dockerfile | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/RELEASES.md b/RELEASES.md index be11f644123..10c4994f2da 100644 --- a/RELEASES.md +++ b/RELEASES.md @@ -84,8 +84,6 @@ Compatibility Notes `Delimiter::None`. - [Moved support for the CloudABI target to tier 3.][75568] - [`linux-gnu` targets now require minimum kernel 2.6.32 and glibc 2.11.][74163] -- [We have reports of some proc macros encountering as yet undiagnosed problems in linked C++ - code, but the root cause is as yet undiagnosed.][76980] Internal Only -------- 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 1f0978c0082..7681eaef60f 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 \ --set target.x86_64-unknown-linux-gnu.linker=clang \ --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.thin-lto=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 |