Skip to content

/cargo

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

Fix build on MSVC #1724

Merged
merged 1 commit into from Jun 24, 2015

Conversation

Reviewers
No reviews
Assignees

@brson brson

Labels
None yet
Projects
None yet
Milestone
No milestone
6 participants
@alexcrichton @rust-highfive @bors @brson @retep998 @wycats
@alexcrichton
Copy link
Member

alexcrichton commented Jun 17, 2015

  • Download all snapshots and such from static.rust-lang.org (drive-by fix)
  • Update dependencies to work and build on MSVC
    • ssh2-sys uses nmake to build libssh2
    • libgit2-sys uses cmake to build libgit2
    • curl-sys uses nmake to build libcurl
    • libz-sys uses nmake to build zlib
    • miniz-sys uses gcc-rs to drive cl.exe manually
    • term updated to pick up windows-specific deps on MSVC
  • Updated .travis.install.deps.sh to install MSVC target libraries on Windows,
    so the compiler can be used to target MSVC. A 64-bit target is now used by
    default as well.
  • Updated the configure script and Makefile to set appropriate environment
    variables to build Cargo from a MSYS shell with a MSVC target. This is similar
    to how Rust bootstraps on MSVC as well.

With this commit Cargo can successfully bootstrap itself on MSVC (use the MSVC
product to build itself again). The tests currently do not pass because
unwinding is not implemented, but soon!

Closes #1725

@rust-highfive rust-highfive assigned wycats Jun 17, 2015

@rust-highfive

This comment has been minimized.

Sign in to view
Copy link

rust-highfive commented Jun 17, 2015

r? @wycats

(rust_highfive has picked a reviewer for you, use r? to override)

@alexcrichton alexcrichton force-pushed the alexcrichton:msvc branch 3 times, most recently from 81ac6e3 to 913f97b Jun 17, 2015

@alexcrichton alexcrichton referenced this pull request Jun 17, 2015

Closed

SSL certificate problem: unable to get local issuer certificate #1725

@bors

This comment has been minimized.

Sign in to view
Copy link
Contributor

bors commented Jun 21, 2015

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

@alexcrichton alexcrichton force-pushed the alexcrichton:msvc branch from 913f97b to 23b23cd Jun 22, 2015

@alexcrichton

This comment has been minimized.

Sign in to view
Copy link
Member Author

alexcrichton commented Jun 22, 2015

r? @brson

@rust-highfive rust-highfive assigned brson and unassigned wycats Jun 22, 2015

@bors

This comment has been minimized.

Sign in to view
Copy link
Contributor

bors commented Jun 24, 2015

☔️ The latest upstream changes (presumably #1740) made this pull request unmergeable. Please resolve the merge conflicts.
@alexcrichton
Fix build on MSVC 
* Download all snapshots and such from static.rust-lang.org (drive-by fix)
* Update dependencies to work and build on MSVC
  * ssh2-sys uses `nmake` to build libssh2
  * libgit2-sys uses `cmake` to build libgit2
  * curl-sys uses `nmake` to build libcurl
  * libz-sys uses `nmake` to build zlib
  * miniz-sys uses `gcc-rs` to drive `cl.exe` manually
  * term updated to pick up windows-specific deps on MSVC
* Updated .travis.install.deps.sh to install MSVC target libraries on Windows,
  so the compiler can be used to target MSVC. A 64-bit target is now used by
  default as well.
* Updated the configure script and Makefile to set appropriate environment
  variables to build Cargo from a MSYS shell with a MSVC target. This is similar
  to how Rust bootstraps on MSVC as well.

With this commit Cargo can successfully bootstrap itself on MSVC (use the MSVC
product to build itself again). The tests currently do not pass because
unwinding is not implemented, but soon!
Loading status checks…
0da6c94

@alexcrichton alexcrichton force-pushed the alexcrichton:msvc branch from 23b23cd to 0da6c94 Jun 24, 2015

@brson

This comment has been minimized.

Sign in to view
Copy link
Contributor

brson commented Jun 24, 2015

@bors r+
@bors

This comment has been minimized.

Sign in to view
Copy link
Contributor

bors commented Jun 24, 2015

📌 Commit 0da6c94 has been approved by brson

bors added a commit that referenced this pull request Jun 24, 2015

@bors
Auto merge of #1724 - alexcrichton:msvc, r=brson 
* Download all snapshots and such from static.rust-lang.org (drive-by fix)
* Update dependencies to work and build on MSVC
  * ssh2-sys uses `nmake` to build libssh2
  * libgit2-sys uses `cmake` to build libgit2
  * curl-sys uses `nmake` to build libcurl
  * libz-sys uses `nmake` to build zlib
  * miniz-sys uses `gcc-rs` to drive `cl.exe` manually
  * term updated to pick up windows-specific deps on MSVC
* Updated .travis.install.deps.sh to install MSVC target libraries on Windows,
  so the compiler can be used to target MSVC. A 64-bit target is now used by
  default as well.
* Updated the configure script and Makefile to set appropriate environment
  variables to build Cargo from a MSYS shell with a MSVC target. This is similar
  to how Rust bootstraps on MSVC as well.

With this commit Cargo can successfully bootstrap itself on MSVC (use the MSVC
product to build itself again). The tests currently do not pass because
unwinding is not implemented, but soon!

Closes #1725
Loading status checks…
a2dd2ac
@bors

This comment has been minimized.

Sign in to view
Copy link
Contributor

bors commented Jun 24, 2015

⌛️ Testing commit 0da6c94 with merge a2dd2ac...
@bors

This comment has been minimized.

Sign in to view
Copy link
Contributor

bors commented Jun 24, 2015

☀️ Test successful - cargo-linux-32, cargo-linux-64, cargo-mac-32, cargo-mac-64, cargo-win-gnu-32, cargo-win-gnu-64

@bors bors merged commit 0da6c94 into rust-lang:master Jun 24, 2015
2 checks passed

2 checks passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
@bors

This comment has been minimized.

Sign in to view
Copy link
Contributor

bors commented Jun 24, 2015

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

This comment has been minimized.

Sign in to view
Copy link
Member

retep998 commented Jun 24, 2015

^This pull request made this pull request unmergeable???

@alexcrichton alexcrichton deleted the alexcrichton:msvc branch Jun 24, 2015

@barosl barosl referenced this pull request Jun 24, 2015

Open

[This PR] made this pull request unmergeable #91

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.