Skip to content

Revert rust-lld place changes #59672

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 1 commit into from
Apr 4, 2019
Merged

Revert rust-lld place changes #59672

merged 1 commit into from
Apr 4, 2019

Conversation

o01eg
Copy link
Contributor

@o01eg o01eg commented Apr 3, 2019

Fixes #59661.

Instead of #59668 it reverts only failed part.

@rust-highfive
Copy link
Contributor

r? @nikomatsakis

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 3, 2019
@o01eg
Copy link
Contributor Author

o01eg commented Apr 3, 2019

r? @alexcrichton

@mati865 mati865 mentioned this pull request Apr 3, 2019
Closed
@oli-obk
Copy link
Contributor

oli-obk commented Apr 3, 2019

@bors r+ p=1 (regression fix that we should test asap)

@bors
Copy link
Collaborator

bors commented Apr 3, 2019

📌 Commit 5b292ec has been approved by oli-obk

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Apr 3, 2019
@alexcrichton alexcrichton mentioned this pull request Apr 3, 2019
Closed
retep998
retep998 reviewed Apr 3, 2019
View reviewed changes
src/bootstrap/dist.rs
@@ -518,8 +518,7 @@ impl Step for Rustc {
.join("bin")
.join(&exe);
// for the rationale about this rename check `compile::copy_lld_to_sysroot`
let dst = image.join(libdir_relative)
.join("rustlib")
let dst = image.join("lib/rustlib")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Joining / on Windows is a bad idea, in case the path ever turns out to be a //?/ path which only understands \.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"lib/rustlib" used here before also it used on other places as well.

@bors
Copy link
Collaborator

bors commented Apr 3, 2019

⌛ Testing commit 5b292ec with merge 17596752980f11debabe151a007bf633f30d40b8...

Centril added a commit to Centril/rust that referenced this pull request Apr 3, 2019
@Centril
Rollup merge of rust-lang#59672 - o01eg:fix-59661, r=oli-obk
4688691 
Revert rust-lld place changes

Fixes rust-lang#59661.

Instead of rust-lang#59668 it reverts only failed part.
@Centril Centril mentioned this pull request Apr 3, 2019
Closed
@Centril
Copy link
Contributor

Centril commented Apr 3, 2019

Rolled up into #59678, @bors retry

@bors
Copy link
Collaborator

bors commented Apr 3, 2019

⌛ Testing commit 5b292ec with merge 8fda69b8875189d5b60d469f6ef0bbac58de3a8d...

@Centril
Copy link
Contributor

Centril commented Apr 3, 2019

@bors retry

@rust-lang rust-lang deleted a comment from rust-highfive Apr 3, 2019
@bors
Copy link
Collaborator

bors commented Apr 3, 2019

⌛ Testing commit 5b292ec with merge 4cd873eafcc7f0c662c5216d41b9ce2af2d64bbc...

Centril added a commit to Centril/rust that referenced this pull request Apr 3, 2019
@Centril
Rollup merge of rust-lang#59672 - o01eg:fix-59661, r=oli-obk
fa2dfda 
Revert rust-lld place changes

Fixes rust-lang#59661.

Instead of rust-lang#59668 it reverts only failed part.
@Centril Centril mentioned this pull request Apr 3, 2019
Closed
@Centril
Copy link
Contributor

Centril commented Apr 3, 2019

@bors retry

Added to #59682.

@bors
Copy link
Collaborator

bors commented Apr 3, 2019

⌛ Testing commit 5b292ec with merge 314a79c...

bors added a commit that referenced this pull request Apr 3, 2019
@bors
Auto merge of #59672 - o01eg:fix-59661, r=oli-obk
314a79c 
Revert rust-lld place changes

Fixes #59661.

Instead of #59668 it reverts only failed part.
@bors
Copy link
Collaborator

bors commented Apr 4, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: oli-obk
Pushing 314a79c to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 4, 2019
@bors bors merged commit 5b292ec into rust-lang:master Apr 4, 2019
@o01eg o01eg deleted the fix-59661 branch April 4, 2019 03:40
@mati865
Copy link
Member

mati865 commented Apr 4, 2019 •
edited
Loading

Artifacts: https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rustc-builds/314a79cd80ed905f80d24b79fd7acb4c8c72789b/rustc-nightly-x86_64-pc-windows-gnu.tar.gz

Location of rust-lld returned to the where is should be:
rustc-nightly-x86_64-pc-windows-gnu/rustc/lib/rustlib/x86_64-pc-windows-gnu/bin/rust-lld.exe

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
1 more reviewer

@retep998 retep998 retep998 left review comments

Reviewers whose approvals may not affect merge requirements
Assignees

@alexcrichton alexcrichton

Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@o01eg @rust-highfive @oli-obk @bors @Centril @mati865 @retep998 @alexcrichton @nikomatsakis