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

incr.comp.: Add -C incremental in addition to -Z incremental #46751

Merged
merged 1 commit into from
Dec 20, 2017

Conversation

michaelwoerister
Copy link
Member

This PR adds a stable commandline option for invoking incremental compilation.

r? @alexcrichton

@kennytm kennytm added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Dec 16, 2017
if cg.lto && debugging_opts.incremental.is_some() {
let incremental = match (&debugging_opts.incremental, &cg.incremental) {
(&Some(ref path1), &Some(ref path2)) => {
if path1 == path2 {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldnt this be a !=, currently it errors when there is no conflict

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch! Thanks, @bjorn3.

@alexcrichton
Copy link
Member

r=me with a typo fix

@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Contributor

bors commented Dec 18, 2017

📌 Commit 796264b has been approved by alexcrichton

@kennytm kennytm 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 Dec 18, 2017
@bors
Copy link
Contributor

bors commented Dec 19, 2017

⌛ Testing commit 796264b with merge b918f0484127ce7076cc9810e85c9e9f856fbf12...

@matprec
Copy link
Contributor

matprec commented Dec 19, 2017

Might travis be stuck somewhere? The build for i686-gnu hasn't started yet whilst all others are done but according to travis status there is no backlog for linux

@bors
Copy link
Contributor

bors commented Dec 19, 2017

💔 Test failed - status-travis

@alexcrichton
Copy link
Member

@bors: retry

  • presumed spurious Travis bug...

kennytm added a commit to kennytm/rust that referenced this pull request Dec 20, 2017
…lexcrichton

incr.comp.: Add `-C incremental` in addition to `-Z incremental`

This PR adds a stable commandline option for invoking incremental compilation.

r? @alexcrichton
bors added a commit that referenced this pull request Dec 20, 2017
Rollup of 14 pull requests

- Successful merges: #46359, #46517, #46671, #46751, #46760, #46787, #46794, #46828, #46831, #46835, #46851, #46852, #46856, #46870
- Failed merges:
@bors bors merged commit 796264b into rust-lang:master Dec 20, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants