diff options
| author | Phil Christensen <philc@microsoft.com> | 2019-06-18 00:01:32 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-18 00:01:32 -0700 |
| commit | e4acc60b3c9acb7fe7a323f146234e3aeab7cab6 (patch) | |
| tree | b7fb321eb77c98e598b7f780fc6d88c718360c96 /scripts | |
| parent | 09d8df72aabf7bae33a88615d09a3f4591400936 (diff) | |
| download | vcpkg-e4acc60b3c9acb7fe7a323f146234e3aeab7cab6.tar.gz vcpkg-e4acc60b3c9acb7fe7a323f146234e3aeab7cab6.zip | |
address qhull flaky build with msvc linker (#6943)
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/cmake/vcpkg_execute_build_process.cmake | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/cmake/vcpkg_execute_build_process.cmake b/scripts/cmake/vcpkg_execute_build_process.cmake index 27e8c8163..d440ba2f6 100644 --- a/scripts/cmake/vcpkg_execute_build_process.cmake +++ b/scripts/cmake/vcpkg_execute_build_process.cmake @@ -59,7 +59,8 @@ function(vcpkg_execute_build_process) if(out_contents MATCHES "LINK : fatal error LNK1102:" OR out_contents MATCHES " fatal error C1060: " OR err_contents MATCHES "LINK : fatal error LNK1102:" OR err_contents MATCHES " fatal error C1060: " OR out_contents MATCHES "LINK : fatal error LNK1318: Unexpected PDB error; ACCESS_DENIED" - OR out_contents MATCHES "LINK : fatal error LNK1104:") + OR out_contents MATCHES "LINK : fatal error LNK1104:" + OR out_contents MATCHES "LINK : fatal error LNK1201:") # The linker ran out of memory during execution. We will try continuing once more, with parallelism disabled. message(STATUS "Restarting Build without parallelism because memory exceeded") set(LOG_OUT "${CURRENT_BUILDTREES_DIR}/${_ebp_LOGNAME}-out-1.log") |