diff options
author | Hans Wennborg <hans@hanshq.net> | 2013-10-10 17:31:54 +0000 |
---|---|---|
committer | Hans Wennborg <hans@hanshq.net> | 2013-10-10 17:31:54 +0000 |
commit | 6a24c7d4e78ade068e60cbb95adb5021014ba0b7 (patch) | |
tree | df2d6e34db9e3d2c1d1a911ee005009d02c8d2cc /tools | |
parent | 47fbbc2dc5696d27f4e3c8a5432777976dd8da0a (diff) | |
download | llvm-6a24c7d4e78ade068e60cbb95adb5021014ba0b7.tar.gz llvm-6a24c7d4e78ade068e60cbb95adb5021014ba0b7.tar.bz2 llvm-6a24c7d4e78ade068e60cbb95adb5021014ba0b7.tar.xz |
Fix msbuild integration install script.
We previously failed to check whether the SUCCESS variable was set,
and would thus always exit with a failure if vs2012 didn't exist.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@192370 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'tools')
-rw-r--r-- | tools/msbuild/install.bat | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/tools/msbuild/install.bat b/tools/msbuild/install.bat index 2b66a6c01a..fb00d277b9 100644 --- a/tools/msbuild/install.bat +++ b/tools/msbuild/install.bat @@ -18,8 +18,9 @@ IF EXIST %D% GOTO FOUND_V110 SET D="%ProgramFiles(x86)%\MSBuild\Microsoft.Cpp\v4.0\V110\Platforms\Win32\PlatformToolsets"
IF EXIST %D% GOTO FOUND_V110
-IF NOT SUCCESS == 1 echo Failed to find MSBuild toolsets directory.
-IF NOT SUCCESS == 1 goto FAILED
+IF %SUCCESS% == 1 goto DONE
+echo Failed to find MSBuild toolsets directory.
+goto FAILED
:FOUND_V100
@@ -45,6 +46,8 @@ copy Microsoft.Cpp.Win32.LLVM-vs2012_xp.props %D%\LLVM-vs2012_xp IF NOT %ERRORLEVEL% == 0 GOTO FAILED
copy Microsoft.Cpp.Win32.LLVM-vs2012_xp.targets %D%\LLVM-vs2012_xp
IF NOT %ERRORLEVEL% == 0 GOTO FAILED
+
+:DONE
echo Done!
goto END
|