summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Wennborg <hans@hanshq.net>2013-10-10 17:31:54 +0000
committerHans Wennborg <hans@hanshq.net>2013-10-10 17:31:54 +0000
commitd2aa909462acf85c95c60e1d7b1515549eb98bca (patch)
tree1ffa261c5e284071128b8febdc24784ccb16dd60
parent26594caec4bf6441e82479b45cfe0428a6706da8 (diff)
downloadbcm5719-llvm-d2aa909462acf85c95c60e1d7b1515549eb98bca.tar.gz
bcm5719-llvm-d2aa909462acf85c95c60e1d7b1515549eb98bca.zip
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. llvm-svn: 192370
-rw-r--r--llvm/tools/msbuild/install.bat7
1 files changed, 5 insertions, 2 deletions
diff --git a/llvm/tools/msbuild/install.bat b/llvm/tools/msbuild/install.bat
index 2b66a6c01ae..fb00d277b9c 100644
--- a/llvm/tools/msbuild/install.bat
+++ b/llvm/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
OpenPOWER on IntegriCloud