Skip to content

Commit

Permalink
Auto merge of #77642 - pietroalbini:stable-next, r=pietroalbini
Browse files Browse the repository at this point in the history
Rust 1.47.0 stable release, take 2

This PR adds a workaround for #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`
  • Loading branch information
bors committed Oct 7, 2020
2 parents 90ed0a8 + b4c560a commit 18bf6b4
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 3 deletions.
2 changes: 0 additions & 2 deletions RELEASES.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
--------
Expand Down
2 changes: 1 addition & 1 deletion src/ci/docker/host-x86_64/dist-x86_64-linux/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 18bf6b4

Please sign in to comment.