diff options
| author | Stephen Toub <stoub@microsoft.com> | 2015-04-26 22:20:06 -0400 |
|---|---|---|
| committer | Stephen Toub <stoub@microsoft.com> | 2015-04-27 12:58:07 -0400 |
| commit | 2bac47575e7f78b2e6b3f9d0656572843f459c15 (patch) | |
| tree | dee28cf09a263f41767c45062915f0e74ca4c564 /tests/runtest.cmd | |
| parent | 7fc9feeedbabd0f7991aa519271bdc7bd2f740e0 (diff) | |
| download | coreclr-2bac47575e7f78b2e6b3f9d0656572843f459c15.tar.gz coreclr-2bac47575e7f78b2e6b3f9d0656572843f459c15.tar.bz2 coreclr-2bac47575e7f78b2e6b3f9d0656572843f459c15.zip | |
Enable building linuxmscorlib / osxmscorlib with VS2015
Trying to do "build linuxmscorlib vs2015" was resulting in an error due to the script trying to read %_msbuildexe% when _msbuildexe hadn't been defined. When that was addressed, mscorlib was then also failing to compile due to the csc compiler not understanding a flag that was being set in the response file based on UseRoslynCompiler not being set. This commit addresses both issues.
Diffstat (limited to 'tests/runtest.cmd')
| -rw-r--r-- | tests/runtest.cmd | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tests/runtest.cmd b/tests/runtest.cmd index a162d791c7..3624169038 100644 --- a/tests/runtest.cmd +++ b/tests/runtest.cmd @@ -35,8 +35,12 @@ goto :eof if /i "%__VSVersion%" =="vs2015" goto MSBuild14 set _msbuildexe="%ProgramFiles(x86)%\MSBuild\12.0\Bin\MSBuild.exe" if not exist %_msbuildexe% set _msbuildexe="%ProgramFiles%\MSBuild\12.0\Bin\MSBuild.exe" -:MSBuild14 if not exist %_msbuildexe% set _msbuildexe="%ProgramFiles(x86)%\MSBuild\14.0\Bin\MSBuild.exe" +goto :CheckMSBuild14 +:MSBuild14 +set _msbuildexe="%ProgramFiles(x86)%\MSBuild\14.0\Bin\MSBuild.exe" +set UseRoslynCompiler=true +:CheckMSBuild14 if not exist %_msbuildexe% set _msbuildexe="%ProgramFiles%\MSBuild\14.0\Bin\MSBuild.exe" if not exist %_msbuildexe% echo Error: Could not find MSBuild.exe. Please see https://github.com/dotnet/corefx/wiki/Developer%%20Guide for build instructions. && exit /b 1 |