rustbuild: Support specifying archiver and linker explicitly #45191
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Mark-Simulacrum
approved these changes
Oct 11, 2017
src/bootstrap/builder.rs
Outdated
| .env("CFG_RELEASE_CHANNEL", &self.build.config.channel) | ||
| .env("RUSTDOC_REAL", self.rustdoc(host)); | ||
| if let Some(linker) = self.build.linker(host) { | ||
| cmd.arg("--linker").arg(linker).arg("-Z").arg("unstable-options"); |
There was a problem hiding this comment.
I'd prefer this logic to be in src/bin/rustdoc.rs and we can just set RUSTDOC_LINKER here.
There was a problem hiding this comment.
Hm, this could actually solve the issue with doctests as well if I understand correctly.
aidanhs
added
the
S-waiting-on-review
|
To give some background, I need to build Rust on a Linux server 1) using specific toolchain that is not in Without this patch my workaround looks roughly like this (in shell pseudocode): mkdir my_toolchain
ln -s actual_toolchain/gcc my_toolchain/cc
ln -s actual_toolchain/gar my_toolchain/ar
export PATH=my_toolchain:actual_toolchain:$PATH
./x.py buildEven ignoring |
|
☔ The latest upstream changes (presumably #45233) made this pull request unmergeable. Please resolve the merge conflicts. |
kennytm
added
S-waiting-on-author
|
@bors r=Mark-Simulacrum |
|
📌 Commit 399ff29 has been approved by |
kennytm
added
S-waiting-on-bors
|
⌛ Testing commit 399ff290c65df4a0f0381436a67c18b17f456fbc with merge 05c72874fef283a9dd41b2337b3cbef0e74404d5... |
|
💔 Test failed - status-travis |
|
Failed to find the symbol |
kennytm
added
S-waiting-on-author
|
☔ The latest upstream changes (presumably #45224) made this pull request unmergeable. Please resolve the merge conflicts. |
|
@bors r=Mark-Simulacrum |
|
📌 Commit 89d9ce4 has been approved by |
|
⌛ Testing commit 89d9ce4 with merge c09beac4654260fd53eb18db449229e7bb9c8385... |
|
💔 Test failed - status-travis |
|
Oops, that was silly. |
|
📌 Commit 0577b60 has been approved by |
bors
added a commit
that referenced
this pull request
Oct 16, 2017
rustbuild: Support specifying archiver and linker explicitly With this patch `x.py test` passes without toolchain being in `PATH` if `cc`, `cxx`, `ar`, `linker` and `gdb` are specified in `config.toml` (except for a few `run-make` tests using `nm`). Fixes #41821 r? @Mark-Simulacrum
|
☀️ Test successful - status-appveyor, status-travis |
o01eg
added a commit
to o01eg/gentoo-rust
that referenced
this pull request
Oct 17, 2017
cnd
added a commit
to gentoo/gentoo-rust
that referenced
this pull request
Oct 17, 2017
Fix compilation after rust-lang/rust#45191
alexcrichton
added a commit
to alexcrichton/rust
that referenced
this pull request
Nov 21, 2017
I believe this was forgotten from rust-lang#45191 but hopefully is a simple fix!
alexcrichton
added a commit
to alexcrichton/rust
that referenced
this pull request
Jan 2, 2018
I believe this was forgotten from rust-lang#45191 but hopefully is a simple fix!
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Sep 10, 2020
rustbuild: Build tests with LLD if `use-lld = true` was passed Addresses rust-lang#76127 (comment). Our test suite is generally ready to run with an explicitly specified linker (rust-lang#45191), so LLD specified with `use-lld = true` works as well. Only 4 tests fail (on `x86_64-pc-windows-msvc`): ``` ui/panic-runtime/lto-unwind.rs run-make-fulldeps/debug-assertions run-make-fulldeps/foreign-exceptions run-make-fulldeps/test-harness ``` All of them are legitimate issues with LLD (or at least with combination Rust+LLD) and manifest in segfaults on access to TLS (rust-lang#76127 (comment)). UPD: These issues are caused by rust-lang#72145 and appear because I had `-Ctarget-cpu=native` set. UPD: Further commits build tests with LLD for non-MSVC targets and propagate LLD to more places when `use-lld` is enabled.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
With this patch
x.py testpasses without toolchain being inPATHifcc,cxx,ar,linkerandgdbare specified inconfig.toml(except for a fewrun-maketests usingnm).Fixes #41821
r? @Mark-Simulacrum