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

Rollup of 4 pull requests #39780

Closed
wants to merge 12 commits into from
Closed

Rollup of 4 pull requests #39780

wants to merge 12 commits into from

Conversation

Charlie Fan and others added 12 commits February 11, 2017 13:08
Add cputype recognition for Solaris

Fixes rust-lang#39729
Don't need to catch WindowsError.  That was very silly of me.
remove unnecessary gcc_s addition in libstd for Solaris
…hton

Automate vendoring by invoking cargo-vendor when building src dist tarballs.

This avoids rust-lang#39633 bringing the `src/vendor` checked into git by rust-lang#37524, past 200,000 lines of code.

I believe the strategy of having rustbuild run `cargo vendor` during the `dist src` step is sound.

However, the only way to be sure `cargo-vendor` exists is to run `cargo install --force cargo-vendor`, which will recompile it every time (not passing `--force` means you can't tell between "already exists" and "build error"). ~~This is quite suboptimal and I'd like to somehow do it in each `Dockerfile` that would need it.~~

* [ ] Cache `CARGO_HOME` (i.e. `~/.cargo`) between CI runs
  * `bin/cargo-vendor` and the actual caches are the relevant bits
* [x] Do not build `cargo-vendor` all the time
  * ~~Maybe detect `~/.cargo/bin/cargo-vendor` already exists?~~
  * ~~Could also try to build it in a `Dockerfile` but do we have `cargo`/`rustc` there?~~
  * Final solution: check `cargo install --list` for a line starting with `cargo-vendor `

cc @rust-lang/tools
add solaris rustbuild support

Add Solaris as recognized ostype
Add cputype recognition for Solaris

Fixes rust-lang#39729

A future pull request will discriminate between the commercial release and older opensource derivatives to account for divergence, for now, this is compatible with both.
Fix some typos in the core::fmt docs.
@frewsxcv
Copy link
Member Author

@bors p=10 r+

@bors
Copy link
Contributor

bors commented Feb 13, 2017

📌 Commit fd3e03b has been approved by frewsxcv

@rust-highfive
Copy link
Collaborator

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @brson (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.

@bors
Copy link
Contributor

bors commented Feb 13, 2017

⌛ Testing commit fd3e03b with merge fe276f9...

@bors
Copy link
Contributor

bors commented Feb 13, 2017

💔 Test failed - status-travis

@frewsxcv frewsxcv closed this Feb 13, 2017
@frewsxcv frewsxcv deleted the rollup branch February 13, 2017 13:27
@Centril Centril added the rollup A PR which is a rollup label Oct 24, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
rollup A PR which is a rollup
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants