Skip to content

Include compiler-rt in the source tarball - #64240

Merged
bors merged 1 commit into
rust-lang:masterfrom
maurer:include-compiler-rt
Sep 7, 2019
Merged

Include compiler-rt in the source tarball#64240
bors merged 1 commit into
rust-lang:masterfrom
maurer:include-compiler-rt

Conversation

@maurer

Copy link
Copy Markdown
Contributor

In #60981 we switched to using src/llvm-project/compiler-rt inside
compiler-builtins rather than a separate copy of it.
In order to have the "c" feature turn on in builds from the source
tarball, we need to include that path in its creation.

fixes#64239

In rust-lang#60981 we switched to using src/llvm-project/compiler-rt inside
compiler-builtins rather than a separate copy of it.
In order to have the "c" feature turn on in builds from the source
tarball, we need to include that path in its creation.
fixesrust-lang#64239
@rust-highfive

Copy link
Copy Markdown
Contributor

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @nikomatsakis (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 6, 2019
@maurer

Copy link
Copy Markdown
ContributorAuthor

I'd also like to suggest this get backported to beta, so that rustc-1.38.0-src.tar.gz will not exhibit the same issue that 1.37.0 did.

@alexcrichtonalexcrichton added beta-nominated Nominated for backporting to the compiler in the beta channel. T-release Relevant to the release subteam, which will review and decide on the PR/issue. labels Sep 6, 2019
@alexcrichton

Copy link
Copy Markdown
Member

@bors: r+ rollup

@bors

bors commented Sep 6, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit a26ee85 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 Sep 6, 2019
Centril added a commit to Centril/rust that referenced this pull request Sep 7, 2019
…richton
Include compiler-rt in the source tarball
In rust-lang#60981 we switched to using src/llvm-project/compiler-rt inside
compiler-builtins rather than a separate copy of it.
In order to have the "c" feature turn on in builds from the source
tarball, we need to include that path in its creation.
fixesrust-lang#64239
@CentrilCentril mentioned this pull request Sep 7, 2019
bors added a commit that referenced this pull request Sep 7, 2019
Rollup of 10 pull requests
Successful merges:
- #63919 (Use hygiene for AST passes)
- #63927 (Filter linkcheck spurious failure)
- #64149 (rustc_codegen_llvm: give names to non-alloca variable values.)
- #64192 (Bail out when encountering likely missing turbofish in parser)
- #64231 (Move the HIR CFG to `rustc_ast_borrowck`)
- #64233 (Correct pluralisation of various diagnostic messages)
- #64236 (reduce visibility)
- #64240 (Include compiler-rt in the source tarball)
- #64241 ([doc] Added more prereqs and note about default directory)
- #64243 (Move injection of attributes from command line to `libsyntax_ext`)
Failed merges:
r? @ghost
@bors
bors merged commit a26ee85 into rust-lang:masterSep 7, 2019
@Mark-SimulacrumMark-Simulacrum added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Sep 12, 2019
@cuvipercuviper mentioned this pull request Sep 13, 2019
bors added a commit that referenced this pull request Sep 14, 2019
[beta] Rollup backports
Cherry-picked:
- Permit unwinding through FFI by default #62603
- pprust: Do not print spaces before some tokens #63897
- Account for doc comments coming from proc macros without spans #63930
- Support "soft" feature-gating using a lint #64066
- Update xLTO compatibility table in rustc book. #64092
- Include compiler-rt in the source tarball #64240
- Update LLVM submodule #64317
r? @Mark-Simulacrum
@cuvipercuviper removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Sep 14, 2019
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.T-releaseRelevant to the release subteam, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

compiler-rt missing from rustc-1.37.0-src.tar.gz

7 participants

@maurer@rust-highfive@alexcrichton@bors@cuviper@nikomatsakis@Mark-Simulacrum