Skip to content

Fix Universal CRT detection on weird setups - #30516

Merged
bors merged 1 commit into
rust-lang:masterfrom
retep998:non-universal-crt
Dec 22, 2015
Merged

Fix Universal CRT detection on weird setups#30516
bors merged 1 commit into
rust-lang:masterfrom
retep998:non-universal-crt

Conversation

@retep998

@retep998retep998 commented Dec 22, 2015

Copy link
Copy Markdown
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 <retep998@gmail.com>
@retep998

retep998 commented Dec 22, 2015

Copy link
Copy Markdown
ContributorAuthor

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

alexcrichton commented Dec 22, 2015

Copy link
Copy Markdown
Member

@bors: r+ e77ab57 p=1

@bors

bors commented Dec 22, 2015

Copy link
Copy Markdown
Collaborator

⌛ 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

bors commented Dec 22, 2015

Copy link
Copy Markdown
Collaborator

☀️ 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:masterDec 22, 2015
@retep998retep998 mentioned this pull request Jan 7, 2016
Closed
@brsonbrson added I-nominated beta-nominated Nominated for backporting to the compiler in the beta channel. labels Jan 7, 2016
@brson

brson commented Jan 7, 2016

Copy link
Copy Markdown
Contributor

Requested for backport in #30229

@brsonbrson 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
@brsonbrson mentioned this pull request Jan 12, 2016
Merged
@alexcrichton

alexcrichton commented Jan 12, 2016

Copy link
Copy Markdown
Member

Accepted for a backport

@alexcrichtonalexcrichton removed beta-nominated Nominated for backporting to the compiler in the beta channel. T-tools labels Jan 12, 2016
@briansmithbriansmith mentioned this pull request Jan 12, 2016
Closed
@alexcrichtonalexcrichton mentioned this pull request Jan 20, 2016
Closed
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@alexcrichtonalexcrichton

Labels

beta-acceptedAccepted for backporting to the compiler in the beta channel.relnotesMarks 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