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

rustbuild: use configured linker to build bootstrap #55378

Merged
merged 1 commit into from
Oct 26, 2018

Conversation

Keruspe
Copy link
Contributor

@Keruspe Keruspe commented Oct 26, 2018

Currently, bootstrap uses it to compile everything, but x.py wasn't using it yet to build bootstrap itself.
This fixes the build for systems where the linker isn't called cc.

Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
@rust-highfive
Copy link
Collaborator

r? @aturon

(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 Oct 26, 2018
@petrochenkov
Copy link
Contributor

@bors r+ rollup

Thanks!
It's great that this linker configuration is tested somewhere.
Custom linker/archiver options are not tested on CI, so they could regress on any occasion.

@bors
Copy link
Contributor

bors commented Oct 26, 2018

📌 Commit bc87c71 has been approved by petrochenkov

@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 Oct 26, 2018
kennytm added a commit to kennytm/rust that referenced this pull request Oct 26, 2018
…enkov

rustbuild: use configured linker to build boostrap

Currently, bootstrap uses it to compile everything, but x.py wasn't using it yet to build bootstrap itself.
This fixes the build for systems where the linker isn't called `cc`.
bors added a commit that referenced this pull request Oct 26, 2018
Rollup of 21 pull requests

Successful merges:

 - #54816 (Don't try to promote already promoted out temporaries)
 - #54824 (Cleanup rustdoc tests with `@!has` and `@!matches`)
 - #54921 (Add line numbers option to rustdoc)
 - #55167 (Add a "cheap" mode for `compute_missing_ctors`.)
 - #55258 (Fix Rustdoc ICE when checking blanket impls)
 - #55264 (Compile the libstd we distribute with -Ccodegen-unit=1)
 - #55271 (Unimplement ExactSizeIterator for MIR traversing iterators)
 - #55292 (Macro diagnostics tweaks)
 - #55298 (Point at macro definition when no rules expect token)
 - #55301 (List allowed tokens after macro fragments)
 - #55302 (Extend the impl_stable_hash_for! macro for miri.)
 - #55325 (Fix link to macros chapter)
 - #55343 (rustbuild: fix remap-debuginfo when building a release)
 - #55346 (Shrink `Statement`.)
 - #55358 (Remove redundant clone (2))
 - #55370 (Update mailmap for estebank)
 - #55375 (Typo fixes in configure_cmake comments)
 - #55378 (rustbuild: use configured linker to build boostrap)
 - #55379 (validity: assert that unions are non-empty)
 - #55383 (Use `SmallVec` for the queue in `coerce_unsized`.)
 - #55391 (bootstrap: clean up a few clippy findings)
@bors bors merged commit bc87c71 into rust-lang:master Oct 26, 2018
@Keruspe
Copy link
Contributor Author

Keruspe commented Oct 29, 2018

If the beta get based to an older commit, could this be nominated?

@Keruspe
Copy link
Contributor Author

Keruspe commented Nov 3, 2018

@petrochenkov The beta has indeed finally been based on an older commit, can this be beta-nominated?

@petrochenkov
Copy link
Contributor

Ok, this is a tiny change, beta-nominating.

@petrochenkov petrochenkov added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Nov 3, 2018
@pnkfelix pnkfelix changed the title rustbuild: use configured linker to build boostrap rustbuild: use configured linker to build bootstrap Nov 8, 2018
@pnkfelix
Copy link
Member

pnkfelix commented Nov 8, 2018

beta-accepting. (I assume that if this causes problems, we'll find out in very short order...)

@pnkfelix pnkfelix added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Nov 8, 2018
@pietroalbini pietroalbini removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Nov 10, 2018
bors added a commit that referenced this pull request Nov 10, 2018
[beta] Rollup backports

Merged and approved:

* #55831: [beta]: Update Cargo's submodule
* #55717: Bubble up an overflow error so that rustdoc can ignore it
* #55637: Do not attempt to ascribe projections out of a ty var
* #55378: rustbuild: use configured linker to build bootstrap

r? @ghost
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
beta-accepted Accepted for backporting to the compiler in the beta channel. 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