diff options
| author | Carlos O'Ryan <coryan@users.noreply.github.com> | 2021-08-05 15:44:18 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-05 15:44:18 -0700 |
| commit | 297349f9236db97defd14d00c3d680a3c8d4bc8c (patch) | |
| tree | 70ec020ae3724ec488bdfcfca28a5b41c8d9feb0 /scripts | |
| parent | 3ab8c7487451cc61c778258c92bd88dfe3c5f32e (diff) | |
| download | vcpkg-297349f9236db97defd14d00c3d680a3c8d4bc8c.tar.gz vcpkg-297349f9236db97defd14d00c3d680a3c8d4bc8c.zip | |
[vcpkg] add support to bootstrap.sh for CXX vars with ccache (#19386)
Co-authored-by: Scott Hart <sdhart@google.com>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/bootstrap.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index a4189351c..488ba5d93 100644 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -305,7 +305,7 @@ if [ "${VCPKG_MAX_CONCURRENCY}" != "" ] ; then cmakeConfigOptions=" $cmakeConfigOptions '-DCMAKE_JOB_POOL_COMPILE:STRING=compile' '-DCMAKE_JOB_POOL_LINK:STRING=link' '-DCMAKE_JOB_POOLS:STRING=compile=$VCPKG_MAX_CONCURRENCY;link=$VCPKG_MAX_CONCURRENCY' " fi -(cd "$buildDir" && eval CXX="$CXX" "$cmakeExe" "$srcDir" $cmakeConfigOptions "-DBUILD_TESTING=$vcpkgBuildTests" "-DVCPKG_DEVELOPMENT_WARNINGS=OFF" "-DVCPKG_ALLOW_APPLE_CLANG=$vcpkgAllowAppleClang") || exit 1 +(cd "$buildDir" && CXX="$CXX" eval "$cmakeExe" "$srcDir" $cmakeConfigOptions "-DBUILD_TESTING=$vcpkgBuildTests" "-DVCPKG_DEVELOPMENT_WARNINGS=OFF" "-DVCPKG_ALLOW_APPLE_CLANG=$vcpkgAllowAppleClang") || exit 1 (cd "$buildDir" && "$cmakeExe" --build .) || exit 1 rm -rf "$vcpkgRootDir/vcpkg" |