Skip to content

rustbuild: fix remap-debuginfo when building a release - #55343

Merged
bors merged 1 commit into
rust-lang:masterfrom
Keruspe:remap-debuginfo-release
Oct 26, 2018
Merged

rustbuild: fix remap-debuginfo when building a release#55343
bors merged 1 commit into
rust-lang:masterfrom
Keruspe:remap-debuginfo-release

Conversation

@Keruspe

Copy link
Copy Markdown
Contributor

Fallback to the release number as we can't get the git commit sha as we're not in a git repository.

Fixes#55341

Fallback to the release number as we can't get the
git commit sha as we're not in a git repository.
Fixesrust-lang#55341
Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
@rust-highfive

Copy link
Copy Markdown
Contributor

r? @alexcrichton

(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 25, 2018
@alexcrichton

Copy link
Copy Markdown
Member

@bors: r+

@bors

bors commented Oct 25, 2018

Copy link
Copy Markdown
Collaborator

📌 Commit bbc3cd4 has been approved by alexcrichton

@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 25, 2018
@kennytmkennytm mentioned this pull request Oct 26, 2018
kennytm added a commit to kennytm/rust that referenced this pull request Oct 26, 2018
…alexcrichton
rustbuild: fix remap-debuginfo when building a release
Fallback to the release number as we can't get the git commit sha as we're not in a git repository.
Fixesrust-lang#55341
@kennytmkennytm mentioned this pull request Oct 26, 2018
kennytm added a commit to kennytm/rust that referenced this pull request Oct 26, 2018
…alexcrichton
rustbuild: fix remap-debuginfo when building a release
Fallback to the release number as we can't get the git commit sha as we're not in a git repository.
Fixesrust-lang#55341
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 bbc3cd4 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?

@alexcrichton

Copy link
Copy Markdown
Member

Certainly!

@alexcrichtonalexcrichton added beta-nominated Nominated for backporting to the compiler in the beta channel. beta-accepted Accepted for backporting to the compiler in the beta channel. labels Oct 29, 2018
@emilyalbiniemilyalbini mentioned this pull request Oct 31, 2018
@emilyalbiniemilyalbini removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Oct 31, 2018
bors added a commit that referenced this pull request Nov 1, 2018
[beta] Rollup backports
Merged and approved:
* #55494: borrowck=migrate must look at parents of closures
* #55343: rustbuild: fix remap-debuginfo when building a release
* #55412: Fix an ICE in the min_const_fn analysis
Rolled up PRs:
* #55550: [beta] Update the boostrap compiler
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.

5 participants

@Keruspe@rust-highfive@alexcrichton@bors@emilyalbini