Skip to content

rustbuild: use configured linker to build bootstrap - #55378

Merged
bors merged 1 commit into
rust-lang:masterfrom
Keruspe:bootstrap-linker
Oct 26, 2018
Merged

rustbuild: use configured linker to build bootstrap#55378
bors merged 1 commit into
rust-lang:masterfrom
Keruspe:bootstrap-linker

Conversation

@Keruspe

Copy link
Copy Markdown
Contributor

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
Copy Markdown
Contributor

r? @aturon

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

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 26, 2018
@petrochenkov

Copy link
Copy Markdown
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

bors commented Oct 26, 2018

Copy link
Copy Markdown
Collaborator

📌 Commit bc87c71 has been approved by petrochenkov

@borsbors 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
@kennytmkennytm mentioned this pull request 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:masterOct 26, 2018
@Keruspe

Copy link
Copy Markdown
ContributorAuthor

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

@Keruspe

Copy link
Copy Markdown
ContributorAuthor

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

@petrochenkov

Copy link
Copy Markdown
Contributor

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

@petrochenkovpetrochenkov added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Nov 3, 2018
@pnkfelixpnkfelix changed the title rustbuild: use configured linker to build boostraprustbuild: use configured linker to build bootstrapNov 8, 2018
@pnkfelix

Copy link
Copy Markdown
Contributor

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

@pnkfelixpnkfelix added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Nov 8, 2018
@emilyalbiniemilyalbini mentioned this pull request Nov 10, 2018
@emilyalbiniemilyalbini 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 freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

beta-acceptedAccepted for backporting to the compiler in the beta channel.S-waiting-on-borsStatus: 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

@Keruspe@rust-highfive@petrochenkov@bors@pnkfelix@aturon@emilyalbini