Skip to content

Commit

Permalink
Auto merge of #30233 - retep998:where-in-the-world-is-windows-sdk, r=…
Browse files Browse the repository at this point in the history
…alexcrichton

What I've done here is try to make the code match what vcvars does much more closely. It now chooses which SDK to find based on the version of MSVC that it found. It also bases the decision of whether to find all the things on whether `VCINSTALLDIR` has been set, which is more likely to have only been set by an invocation of vcvars, unlike previously where it would do some things only if `LIB` wasn't set even though there was a valid use case for libraries to add themselves to `LIB` without having invoked vcvars.

There are still some debug `println!`s so people can test the PR and make sure it works correctly on various setups.

It supports VS 2015, 2013, and 2012. People who want to use versions of VS older (or newer) than that will have to manually invoke the appropriate vcvars bat file to set the proper environment variables themselves.

Do not merge yet.

Fixes #30229
  • Loading branch information
bors committed Dec 15, 2015
2 parents 8f031bf + 915cb37 commit 9e63cec
Show file tree
Hide file tree
Showing 2 changed files with 173 additions and 286 deletions.
Loading

0 comments on commit 9e63cec

Please sign in to comment.