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

Various minor cleanups to rustbuild #43042

Merged
merged 15 commits into from
Jul 4, 2017

Conversation

Mark-Simulacrum
Copy link
Member

This is work I did before the migration to the new rustbuild. I'd prefer to land this first, before my other PR, to make the diff a little clearer.

r? @alexcrichton

@Mark-Simulacrum Mark-Simulacrum added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 3, 2017
@alexcrichton
Copy link
Member

@bors: r+

Nice cleanups!

@bors
Copy link
Contributor

bors commented Jul 4, 2017

📌 Commit e04754b has been approved by alexcrichton

@Mark-Simulacrum Mark-Simulacrum 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 Jul 4, 2017
@Mark-Simulacrum
Copy link
Member Author

@bors rollup

Mark-Simulacrum added a commit to Mark-Simulacrum/rust that referenced this pull request Jul 4, 2017
…r=alexcrichton

Various minor cleanups to rustbuild

This is work I did before the migration to the new rustbuild. I'd prefer to land this first, before my other PR, to make the diff a little clearer.

r? @alexcrichton
@Mark-Simulacrum
Copy link
Member Author

I think I broke something, need to investigate..

@bors r-

Build completed successfully in 0:01:46
+ python x.py test --host i686-pc-windows-msvc --target i686-pc-windows-msvc
    Finished dev [unoptimized] target(s) in 0.0 secs
thread 'main' panicked at 'no entry found for key', src\libcore\option.rs:823
note: Run with `RUST_BACKTRACE=1` for a backtrace.
failed to run: C:\projects\rust\build\bootstrap/debug/bootstrap test --host i686-pc-windows-msvc --target i686-pc-windows-msvc
Build completed unsuccessfully in 0:00:00

@Mark-Simulacrum
Copy link
Member Author

Ah, found the problem.. I had changed what targets/hosts we find cc/cxx for to be only the ones passed on the command line, but I guess that's not enough.

@bors r=alexcrichton

@bors
Copy link
Contributor

bors commented Jul 4, 2017

📌 Commit 1654a2f has been approved by alexcrichton

Mark-Simulacrum added a commit to Mark-Simulacrum/rust that referenced this pull request Jul 4, 2017
…r=alexcrichton

Various minor cleanups to rustbuild

This is work I did before the migration to the new rustbuild. I'd prefer to land this first, before my other PR, to make the diff a little clearer.

r? @alexcrichton
bors added a commit that referenced this pull request Jul 4, 2017
Rollup of 8 pull requests

- Successful merges: #42227, #42836, #42975, #42994, #43041, #43042, #43043, #43045
- Failed merges:
@bors bors merged commit 1654a2f into rust-lang:master Jul 4, 2017
@Mark-Simulacrum Mark-Simulacrum deleted the rustbuild-cleanup branch June 8, 2019 13:52
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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants