From bb166d946ce40d0f962d88cc7b9fa0a30d8eacaf Mon Sep 17 00:00:00 2001 From: Nicole Mazzuca Date: Wed, 15 Apr 2020 10:03:22 -0700 Subject: [PATCH] [vcpkg] Fix bootstrap from out of directory In my last PR, I broke building vcpkg from a directory that isn't the vcpkg directory; this commit fixes that. --- scripts/bootstrap.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index 7959c446523763..722ffe5c25d794 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"