diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-03-06 17:52:25 -0800 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2017-03-06 17:52:25 -0800 |
| commit | e3d962775771a00044ab9af9c7dc9b8df3e05a7e (patch) | |
| tree | ecc784c920b54d48eec45c48236444f89d3c3329 | |
| parent | 3eb0526468d07824900c462ccfacdeffd7fa1969 (diff) | |
| download | vcpkg-e3d962775771a00044ab9af9c7dc9b8df3e05a7e.tar.gz vcpkg-e3d962775771a00044ab9af9c7dc9b8df3e05a7e.zip | |
[qt5] Fix regression from dd6d1aa5. When building a static triplet, repeat the build on failure.
| -rw-r--r-- | ports/qt5/portfile.cmake | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/ports/qt5/portfile.cmake b/ports/qt5/portfile.cmake index bbb171fd5..ecdc9b8df 100644 --- a/ports/qt5/portfile.cmake +++ b/ports/qt5/portfile.cmake @@ -86,7 +86,14 @@ vcpkg_execute_required_process( message(STATUS "Configure ${TARGET_TRIPLET} done") message(STATUS "Building ${TARGET_TRIPLET}") -vcpkg_execute_required_process( +# Multiple executions are required due to https://bugreports.qt.io/browse/QTBUG-53393 +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + set(COUNT 1) +else() + set(COUNT 3) +endif() +vcpkg_execute_required_process_repeat( + COUNT ${COUNT} COMMAND ${JOM} WORKING_DIRECTORY ${OUTPUT_PATH} LOGNAME build-${TARGET_TRIPLET} |