Skip to content
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

Stop build if vswhere.cmd can't properly set VC vars #14562

Merged
merged 2 commits into from
Oct 13, 2018

Conversation

tylerszabo
Copy link
Contributor

@tylerszabo tylerszabo commented Oct 10, 2018

Description

Stop build if vswhere.cmd can't properly set VC vars

Motivation and Context

When attempting to build for the first time there were some issues that could result in a corrupted environment.

How Has This Been Tested?

  • Attempted to configure for 32-bit then for 64-bit in the same CMD window.
  • Attempted to repeat configuration 64-bit 6 times (PATH would be corrupt after ~3 before) via x64\make-mingwlibs.bat

Screenshots (if appropriate):

N/A

Types of change

  • Bug fix (non-breaking change which fixes an issue)
  • Clean up (non-breaking change which removes non-working, unmaintained functionality)
  • Improvement (non-breaking change which improves existing functionality)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that will cause existing functionality to change)
  • Cosmetic change (non-breaking change that doesn't touch code)
  • None of the above (please explain below)

Checklist:

  • My code follows the Code Guidelines of this project
  • My change requires a change to the documentation, either Doxygen or wiki
  • I have updated the documentation accordingly
  • I have read the Contributing document
  • I have added tests to cover my change
  • All new and existing tests passed

@tylerszabo tylerszabo changed the title Buildfix Stop build if vswhere.cmd can't properly set VC vars Oct 10, 2018
@razzeee
Copy link
Member

razzeee commented Oct 10, 2018

Thank you for this PR. I guess another review from @Rechi and this can be merged.

@razzeee razzeee added Type: Improvement non-breaking change which improves existing functionality v18 Leia labels Oct 10, 2018
IF "%VSWHERE_SET%" NEQ "" (
ECHO ERROR! vswhere.bat: VC vars are configured for %VSWHERE_SET%
EXIT /B 1
)

This comment was marked as spam.

This comment was marked as spam.

tools/buildsteps/windows/vswhere.bat Outdated Show resolved Hide resolved
@@ -3,6 +3,11 @@
PUSHD %~dp0\..

CALL vswhere.bat arm store
IF ERRORLEVEL 1 (
ECHO ERROR! BuildSetup.bat: Something went wrong when calling vswhere.bat

This comment was marked as spam.

This comment was marked as spam.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Platform: Windows Type: Improvement non-breaking change which improves existing functionality v18 Leia
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants