diff options
| author | nicole mazzuca <mazzucan@outlook.com> | 2020-04-15 10:15:12 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-15 10:15:12 -0700 |
| commit | 4db554b93732206ba4a065cc3e067a12c3f626a7 (patch) | |
| tree | 0b67cda0d8aa7f255a8e89d6e3b6c6624016d241 /scripts | |
| parent | 22623e35016cae6061e0d9e502577077b3c33fd9 (diff) | |
| download | vcpkg-4db554b93732206ba4a065cc3e067a12c3f626a7.tar.gz vcpkg-4db554b93732206ba4a065cc3e067a12c3f626a7.zip | |
[vcpkg] Fix bootstrap from out of directory (#10846)
In my last PR, I broke building vcpkg from a directory that isn't the
vcpkg directory; this commit fixes that.
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/bootstrap.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index 7959c4465..722ffe5c2 100644 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -236,11 +236,12 @@ else fi # Do the build -buildDir="$vcpkgRootDir/toolsrc/build.rel" +srcDir="$vcpkgRootDir/toolsrc" +buildDir="$srcDir/build.rel" rm -rf "$buildDir" mkdir -p "$buildDir" -("$cmakeExe" -B "$buildDir" -S toolsrc -DCMAKE_BUILD_TYPE=Release -G "Ninja" "-DCMAKE_MAKE_PROGRAM=$ninjaExe" "-DBUILD_TESTING=OFF" "-DVCPKG_DEVELOPMENT_WARNINGS=OFF" "-DVCPKG_WARNINGS_AS_ERRORS=OFF" "-DVCPKG_DISABLE_METRICS=$vcpkgDisableMetrics" "-DVCPKG_ALLOW_APPLE_CLANG=$vcpkgAllowAppleClang") || exit 1 +("$cmakeExe" -B "$buildDir" -S "$srcDir" -DCMAKE_BUILD_TYPE=Release -G "Ninja" "-DCMAKE_MAKE_PROGRAM=$ninjaExe" "-DBUILD_TESTING=OFF" "-DVCPKG_DEVELOPMENT_WARNINGS=OFF" "-DVCPKG_WARNINGS_AS_ERRORS=OFF" "-DVCPKG_DISABLE_METRICS=$vcpkgDisableMetrics" "-DVCPKG_ALLOW_APPLE_CLANG=$vcpkgAllowAppleClang") || exit 1 ("$cmakeExe" --build "$buildDir") || exit 1 rm -rf "$vcpkgRootDir/vcpkg" |