Skip to content

Update the bootstrap compiler #37800

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Jump to bottom
Merged
merged 1 commit into from
Nov 30, 2016
Merged

Update the bootstrap compiler #37800

merged 1 commit into from
Nov 30, 2016

Conversation

alexcrichton
Copy link
Member

Now that we've got a beta build, let's use it!

@alexcrichton alexcrichton force-pushed the new-bootstrap branch 3 times, most recently from 2f10b41 to 262e5d0 Compare November 17, 2016 00:06
@brson
Copy link
Contributor

brson commented Nov 17, 2016

This is still waiting on a beta that contains a cargo fix for rust-lang/cargo#3280. Next beta after rust-lang-deprecated/rust-packaging#66 should have it.

@brson
Copy link
Contributor

brson commented Nov 17, 2016 •
edited
Loading

Subsumes #37635

@alexcrichton
Copy link
Member Author

Updated the Cargo date, should be good to go

@xen0n xen0n mentioned this pull request Nov 17, 2016
Closed
@alexcrichton alexcrichton mentioned this pull request Nov 18, 2016
Closed
@bors
Copy link
Collaborator

bors commented Nov 20, 2016

☔ The latest upstream changes (presumably #37831) made this pull request unmergeable. Please resolve the merge conflicts.

@bors
Copy link
Collaborator

bors commented Nov 21, 2016

☔ The latest upstream changes (presumably #37127) made this pull request unmergeable. Please resolve the merge conflicts.

@alexcrichton
Copy link
Member Author

r? @brson

@eddyb eddyb mentioned this pull request Nov 28, 2016
Closed
@bors
Copy link
Collaborator

bors commented Nov 30, 2016

☔ The latest upstream changes (presumably #37965) made this pull request unmergeable. Please resolve the merge conflicts.

@alexcrichton
Copy link
Member Author

r? @eddyb

@rust-highfive rust-highfive assigned eddyb and unassigned brson Nov 30, 2016
eddyb
eddyb suggested changes Nov 30, 2016
View reviewed changes
Copy link
Member

@eddyb eddyb left a comment

Choose a reason for hiding this comment

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

r=me with comments addressed.

src/librustc_llvm/lib.rs
#![feature(libc)]
#![feature(link_args)]
#![feature(staged_api)]
Copy link
Member

Choose a reason for hiding this comment

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

This can't/shouldn't be removed - Travis failed on this.

src/tools/compiletest/Cargo.toml
@@ -4,12 +4,6 @@ name = "compiletest"
version = "0.0.0"
build = "build.rs"

# Curiously, this will segfault if compiled with opt-level=3 on 64-bit MSVC when
# running the compile-fail test suite when a should-fail test panics. But hey if
# this is removed and it gets past the bots, sounds good to me.
Copy link
Member

Choose a reason for hiding this comment

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

This comment should be preserved, or opt-level = 2 be removed otherwise at the top-level.

@alexcrichton
Update the bootstrap compiler
2186660 
Now that we've got a beta build, let's use it!
@alexcrichton
Copy link
Member Author

@bors: r=eddyb

@bors
Copy link
Collaborator

bors commented Nov 30, 2016

📌 Commit 2186660 has been approved by eddyb

@bors
Copy link
Collaborator

bors commented Nov 30, 2016

⌛ Testing commit 2186660 with merge ecff71a...

bors added a commit that referenced this pull request Nov 30, 2016
@bors
Auto merge of #37800 - alexcrichton:new-bootstrap, r=eddyb
ecff71a 
Update the bootstrap compiler

Now that we've got a beta build, let's use it!
@bors
Copy link
Collaborator

bors commented Nov 30, 2016

☀️ Test successful - auto-linux-32-nopt-t, auto-linux-32-opt, auto-linux-64-cargotest, auto-linux-64-cross-freebsd, auto-linux-64-debug-opt, auto-linux-64-nopt-t, auto-linux-64-opt, auto-linux-64-opt-rustbuild, auto-linux-64-x-android-t, auto-linux-cross-opt, auto-linux-musl-64-opt, auto-mac-32-opt, auto-mac-64-opt, auto-mac-64-opt-rustbuild, auto-mac-cross-ios-opt, auto-win-gnu-32-opt, auto-win-gnu-32-opt-rustbuild, auto-win-gnu-64-opt, auto-win-msvc-32-opt, auto-win-msvc-64-cargotest, auto-win-msvc-64-opt, auto-win-msvc-64-opt-rustbuild
Approved by: eddyb
Pushing ecff71a to master...

@bors bors merged commit 2186660 into rust-lang:master Nov 30, 2016
This was referenced Nov 30, 2016
Closed
Merged
Merged
Merged
@alexcrichton alexcrichton mentioned this pull request Dec 1, 2016
Merged
@alexcrichton alexcrichton deleted the new-bootstrap branch December 19, 2016 20:45
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers

@eddyb eddyb eddyb requested changes

Assignees

@eddyb eddyb

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@alexcrichton @brson @bors @eddyb