summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xbin/qt5_tool6
1 files changed, 5 insertions, 1 deletions
diff --git a/bin/qt5_tool b/bin/qt5_tool
index a9bcb41..a3bf0a3 100755
--- a/bin/qt5_tool
+++ b/bin/qt5_tool
@@ -909,7 +909,11 @@ if ( $BUILD_WEBKIT != 0) {
if ( $BUILD && $makeInstallRequired ) {
print 'Installing Qt 5 from ',$rootDir,"\n";
- executeCheck($make, (@makeArgs, 'install'));
+ my @installArgs = @makeArgs;
+ # Turn of parallelization for make install, which is known to fail with jom.
+ push (@installArgs, '-j', '1') unless (index($make, 'nmake') >= 0);
+ push (@installArgs, 'install');
+ executeCheck($make, @installArgs);
}
# ---- Build documentation. Note: qch_docs may fail on Windows.