diff options
| author | Ryan Saunders <saunders@aggienetwork.com> | 2019-04-10 23:07:17 -0700 |
|---|---|---|
| committer | Ryan Saunders <saunders@aggienetwork.com> | 2019-04-10 23:07:17 -0700 |
| commit | a492caf9d5a069987b6309c6cbf8e5cc8c3ec6a8 (patch) | |
| tree | 11f6f1c5e3f4caa03f297162ffab9f79941f676c /scripts/bootstrap.sh | |
| parent | 80965287d1483f98f49ba83e026f022369798990 (diff) | |
| parent | b625cbf82f792409fa59262546cb5ed1ef7944e3 (diff) | |
| download | vcpkg-a492caf9d5a069987b6309c6cbf8e5cc8c3ec6a8.tar.gz vcpkg-a492caf9d5a069987b6309c6cbf8e5cc8c3ec6a8.zip | |
Merge branch 'master' into query_deps
Diffstat (limited to 'scripts/bootstrap.sh')
| -rw-r--r-- | scripts/bootstrap.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index 7a1b2777b..056b21cac 100644 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -78,7 +78,7 @@ vcpkgCheckEqualFileHash() echo " File path: [ $downloadPath ]" echo " Expected hash: [ $sha512 ]" echo " Actual hash: [ $actualHash ]" - exit + exit 1 fi } @@ -234,8 +234,8 @@ buildDir="$vcpkgRootDir/toolsrc/build.rel" rm -rf "$buildDir" mkdir -p "$buildDir" -(cd "$buildDir" && CXX=$CXX "$cmakeExe" .. -DCMAKE_BUILD_TYPE=Release -G "Ninja" "-DCMAKE_MAKE_PROGRAM=$ninjaExe" "-DDEFINE_DISABLE_METRICS=$vcpkgDisableMetrics") -(cd "$buildDir" && "$cmakeExe" --build .) +(cd "$buildDir" && CXX=$CXX "$cmakeExe" .. -DCMAKE_BUILD_TYPE=Release -G "Ninja" "-DCMAKE_MAKE_PROGRAM=$ninjaExe" "-DDEFINE_DISABLE_METRICS=$vcpkgDisableMetrics") || exit 1 +(cd "$buildDir" && "$cmakeExe" --build .) || exit 1 rm -rf "$vcpkgRootDir/vcpkg" cp "$buildDir/vcpkg" "$vcpkgRootDir/" |