Skip to content
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.

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

rename rustc's lld to rust-lld #51936

Merged
merged 2 commits into from
Jul 5, 2018
Merged

rename rustc's lld to rust-lld #51936

merged 2 commits into from
Jul 5, 2018

Conversation

japaric
Copy link
Member

@japaric japaric commented Jun 30, 2018

to not shadow the system installed LLD when linking with LLD.

Before:

  • -C linker=lld -Z linker-flavor=ld.lld uses rustc's LLD
  • It's not possible to use a system installed LLD that's named lld

With this commit:

  • -C linker=rust-lld -Z linker-flavor=ld.lld uses rustc's LLD
  • -C linker=lld -Z linker-flavor=ld.lld uses the system installed LLD

we don't offer guarantees about the availability of LLD in the rustc sysroot so we can rename the tool as long as we don't break the wasm32-unknown-unknown target which depends on it.

r? @alexcrichton we discussed this before

to not shadow the system installed LLD when linking with LLD.

Before:

- `-C linker=lld -Z linker-flavor=ld.lld` uses rustc's LLD
- It's not possible to use a system installed LLD that's named `lld`

With this commit:

- `-C linker=rust-lld -Z linker-flavor=ld.lld` uses rustc's LLD
- `-C linker=lld -Z linker-flavor=ld.lld` uses the system installed LLD
@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 30, 2018
@steveklabnik
Copy link
Member

cc @phil-opp , i bet we'll need to update our target specs

@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Contributor

bors commented Jun 30, 2018

📌 Commit 807cd36 has been approved by alexcrichton

@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 Jun 30, 2018
@phil-opp
Copy link
Contributor

phil-opp commented Jul 1, 2018

@steveklabnik Thanks for the heads up!

pietroalbini added a commit to pietroalbini/rust that referenced this pull request Jul 1, 2018
rename rustc's lld to rust-lld

to not shadow the system installed LLD when linking with LLD.

Before:

- `-C linker=lld -Z linker-flavor=ld.lld` uses rustc's LLD
- It's not possible to use a system installed LLD that's named `lld`

With this commit:

- `-C linker=rust-lld -Z linker-flavor=ld.lld` uses rustc's LLD
- `-C linker=lld -Z linker-flavor=ld.lld` uses the system installed LLD

we don't offer guarantees about the availability of LLD in the rustc sysroot so we can rename the tool as long as we don't break the wasm32-unknown-unknown target which depends on it.

r? @alexcrichton we discussed this before
bors added a commit that referenced this pull request Jul 1, 2018
Rollup of 7 pull requests

Successful merges:

 - #51511 (Stabilize Iterator::flatten in 1.29, fixes #48213.)
 - #51853 (Fix some doc links)
 - #51890 (Fix inconsequential typo in GlobalAlloc doc example)
 - #51920 (use literal span for concrete type suggestion)
 - #51922 (rename the llvm-tools component to llvm-tools-preview and tweak its image)
 - #51936 (rename rustc's lld to rust-lld)
 - #51961 (Fix typo in /src/librustc_resolve/lib.rs)

Failed merges:

r? @ghost
@pietroalbini
Copy link
Member

@bors r-
Failed on appveyor.

[00:48:01] thread 'main' panicked at 'failed to copy `C:\projects\rust\build\x86_64-pc-windows-gnu\stage2\lib\rustlib\x86_64-pc-windows-gnu\bin\lld.exe` to `C:\projects\rust\build\tmp/dist\rustc-nightly-x86_64-pc-windows-gnu-image\lib/rustlib\x86_64-pc-windows-gnu\bin\rust-lld.exe`: The system cannot find the file specified. (os error 2)', bootstrap\lib.rs:1108:13

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jul 1, 2018
@japaric
Copy link
Member Author

japaric commented Jul 5, 2018

bors r=alexcrichton

@japaric
Copy link
Member Author

japaric commented Jul 5, 2018

err,

@bors r=alexcrichton

@bors
Copy link
Contributor

bors commented Jul 5, 2018

📌 Commit 31ed5c7 has been approved by alexcrichton

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jul 5, 2018
@bors
Copy link
Contributor

bors commented Jul 5, 2018

⌛ Testing commit 31ed5c7 with merge 6fc21e5...

bors added a commit that referenced this pull request Jul 5, 2018
rename rustc's lld to rust-lld

to not shadow the system installed LLD when linking with LLD.

Before:

- `-C linker=lld -Z linker-flavor=ld.lld` uses rustc's LLD
- It's not possible to use a system installed LLD that's named `lld`

With this commit:

- `-C linker=rust-lld -Z linker-flavor=ld.lld` uses rustc's LLD
- `-C linker=lld -Z linker-flavor=ld.lld` uses the system installed LLD

we don't offer guarantees about the availability of LLD in the rustc sysroot so we can rename the tool as long as we don't break the wasm32-unknown-unknown target which depends on it.

r? @alexcrichton we discussed this before
@bors
Copy link
Contributor

bors commented Jul 5, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: alexcrichton
Pushing 6fc21e5 to master...

@bors bors merged commit 31ed5c7 into rust-lang:master Jul 5, 2018
steveklabnik added a commit to intermezzOS/kernel that referenced this pull request Jul 9, 2018
steveklabnik added a commit to intermezzOS/book that referenced this pull request Jul 9, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants