Skip to content

Update lockfile for gcc and cmake crates to pick up MSVC 2017 fixes#4103

Merged
bors merged 1 commit intorust-lang:masterfrom
brson:vs2017
May 26, 2017
Merged

Update lockfile for gcc and cmake crates to pick up MSVC 2017 fixes#4103
bors merged 1 commit intorust-lang:masterfrom
brson:vs2017

Conversation

@brson
Copy link
Copy Markdown
Contributor

@brson brson commented May 26, 2017

Seems to work.

@rust-highfive
Copy link
Copy Markdown

r? @alexcrichton

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

@brson
Copy link
Copy Markdown
Contributor Author

brson commented May 26, 2017

I'm going to keep investigating problems on x86

@brson brson closed this May 26, 2017
@brson brson reopened this May 26, 2017
@brson
Copy link
Copy Markdown
Contributor Author

brson commented May 26, 2017

I guess it's worth trying to land this.

@brson
Copy link
Copy Markdown
Contributor Author

brson commented May 26, 2017

For some reason I cannot build either rustup or cargo inside a vs2017 "x86 Native Tools Command Prompt" using curl-sys 0.3.11. If I override it with curl-sys from git both build. The error is 'module machine type 'x64' conflicts with target machine type 'X86'.

FWIW here is the rustup pr that is failing on i686.

@brson
Copy link
Copy Markdown
Contributor Author

brson commented May 26, 2017

I'm surprised this succeeded on i686-msvc...

@alexcrichton
Copy link
Copy Markdown
Member

Eh let's see what CI says:

@bors: r+

@bors
Copy link
Copy Markdown
Contributor

bors commented May 26, 2017

📌 Commit aa27157 has been approved by alexcrichton

@brson
Copy link
Copy Markdown
Contributor Author

brson commented May 26, 2017

@bors r=alexcrichton

@bors
Copy link
Copy Markdown
Contributor

bors commented May 26, 2017

📌 Commit 2377bfd has been approved by alexcrichton

@bors
Copy link
Copy Markdown
Contributor

bors commented May 26, 2017

⌛ Testing commit 2377bfd with merge 9693a6c...

bors added a commit that referenced this pull request May 26, 2017
Update lockfile for gcc and cmake crates to pick up MSVC 2017 fixes

Seems to work.
@bors
Copy link
Copy Markdown
Contributor

bors commented May 26, 2017

☀️ Test successful - status-appveyor, status-travis
Approved by: alexcrichton
Pushing 9693a6c to master...

@bors bors merged commit 2377bfd into rust-lang:master May 26, 2017
@ehuss ehuss added this to the 1.19.0 milestone Feb 6, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants