From e3d962775771a00044ab9af9c7dc9b8df3e05a7e Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Mon, 6 Mar 2017 17:52:25 -0800 Subject: [PATCH] [qt5] Fix regression from dd6d1aa5. When building a static triplet, repeat the build on failure. --- ports/qt5/portfile.cmake | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) 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}