Skip to content

Fix Universal CRT detection on weird setups #30516

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 1 commit into from
Dec 22, 2015
Merged

Fix Universal CRT detection on weird setups #30516

merged 1 commit into from
Dec 22, 2015

Conversation

retep998
Copy link
Contributor

Checks for a 10. prefix on the subfolder because that is what vcvars does.

r? @alexcrichton

@retep998
Fix Universal CRT detection on weird setups
e77ab57 
Checks for a `10.` prefix on the subfolder

Signed-off-by: Peter Atashian <[email protected]>
@retep998
Copy link
Contributor Author

An example of a build failing on appveyor due to the issue that this PR will fix: https://ci.appveyor.com/project/alexcrichton/git2-rs/build/job/yegb39jq7hjbr6ku

@alexcrichton
Copy link
Member

@bors: r+ e77ab57 p=1

@bors
Copy link
Collaborator

bors commented Dec 22, 2015

⌛ Testing commit e77ab57 with merge 439e184...

bors added a commit that referenced this pull request Dec 22, 2015
@bors
Auto merge of #30516 - retep998:non-universal-crt, r=alexcrichton
439e184 
Checks for a `10.` prefix on the subfolder because that is what vcvars does.

r? @alexcrichton
@bors
Copy link
Collaborator

bors commented Dec 22, 2015

☀️ Test successful - auto-linux-32-nopt-t, auto-linux-32-opt, auto-linux-64-debug-opt, auto-linux-64-nopt-t, auto-linux-64-opt, auto-linux-64-x-android-t, auto-linux-cross-opt, auto-linux-musl-64-opt, auto-mac-32-opt, auto-mac-64-nopt-t, auto-mac-64-opt, auto-win-gnu-32-nopt-t, auto-win-gnu-32-opt, auto-win-gnu-64-nopt-t, auto-win-gnu-64-opt, auto-win-msvc-32-opt, auto-win-msvc-64-opt

@bors bors merged commit e77ab57 into rust-lang:master Dec 22, 2015
@retep998 retep998 mentioned this pull request Jan 7, 2016
Closed
@brson brson added I-nominated beta-nominated Nominated for backporting to the compiler in the beta channel. labels Jan 7, 2016
@brson
Copy link
Contributor

brson commented Jan 7, 2016

Requested for backport in #30229

@brson brson added beta-accepted Accepted for backporting to the compiler in the beta channel. relnotes Marks issues that should be documented in the release notes of the next release. labels Jan 12, 2016
@brson brson mentioned this pull request Jan 12, 2016
Merged
@alexcrichton
Copy link
Member

Accepted for a backport

@alexcrichton alexcrichton removed beta-nominated Nominated for backporting to the compiler in the beta channel. T-tools labels Jan 12, 2016
@briansmith briansmith mentioned this pull request Jan 12, 2016
Closed
@alexcrichton alexcrichton mentioned this pull request Jan 20, 2016
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@alexcrichton alexcrichton

Labels
beta-accepted Accepted for backporting to the compiler in the beta channel. relnotes Marks issues that should be documented in the release notes of the next release.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@retep998 @alexcrichton @bors @brson