diff options
| author | Hans Wennborg <hans@hanshq.net> | 2014-03-24 17:33:22 +0000 |
|---|---|---|
| committer | Hans Wennborg <hans@hanshq.net> | 2014-03-24 17:33:22 +0000 |
| commit | 9c8f1a7b114048f36992eb373e34414a983fce94 (patch) | |
| tree | b1f931d699b3ba192b42839a733699966b609d9c /llvm/tools/msbuild | |
| parent | b768fe5ea134eae1051006a2c7ea1c4bb07a040b (diff) | |
| download | bcm5719-llvm-9c8f1a7b114048f36992eb373e34414a983fce94.tar.gz bcm5719-llvm-9c8f1a7b114048f36992eb373e34414a983fce94.zip | |
VS integration installer: set SUCCESS=1 if we find VS 2013
Previously we would print an error message on machines where the only VS
version we find is 2013, even though we successfully install the integration
files for it.
Also, we shouldn't have two END labels.
llvm-svn: 204629
Diffstat (limited to 'llvm/tools/msbuild')
| -rw-r--r-- | llvm/tools/msbuild/install.bat | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/llvm/tools/msbuild/install.bat b/llvm/tools/msbuild/install.bat index 3b19fe76d81..9880fb27e9b 100644 --- a/llvm/tools/msbuild/install.bat +++ b/llvm/tools/msbuild/install.bat @@ -8,7 +8,7 @@ cd /d %~dp0 set PLATFORM=None
:START
-IF %PLATFORM% == x64 GOTO END
+IF %PLATFORM% == x64 GOTO LOOPEND
IF %PLATFORM% == Win32 SET PLATFORM=x64
IF %PLATFORM% == None SET PLATFORM=Win32
@@ -30,7 +30,7 @@ IF EXIST %D% GOTO FOUND_V120 SET D="%ProgramFiles(x86)%\MSBuild\Microsoft.Cpp\v4.0\V120\Platforms\%PLATFORM%\PlatformToolsets"
IF EXIST %D% GOTO FOUND_V120
-:END
+:LOOPEND
IF %SUCCESS% == 1 goto DONE
echo Failed to find MSBuild toolsets directory.
goto FAILED
@@ -75,6 +75,7 @@ copy %PLATFORM%\toolset-vs2013_xp.props %D%\LLVM-vs2013_xp\toolset.props IF NOT %ERRORLEVEL% == 0 GOTO FAILED
copy %PLATFORM%\toolset-vs2013_xp.targets %D%\LLVM-vs2013_xp\toolset.targets
IF NOT %ERRORLEVEL% == 0 GOTO FAILED
+set SUCCESS=1
GOTO START
|
