diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-07-11 16:16:40 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-07-11 16:17:29 +0200 |
| commit | 2bc5ad67eb9a2f8549daf02bd8fbf6deff6fb4cb (patch) | |
| tree | 36cf3503e46bcb1cc6498ac95d955bbcca3fd38f | |
| parent | 24abcfdb7432512b21cf4116478641bd790bf4c0 (diff) | |
qt5_tool: Turn off parallelization for make install.
Causes failures on Windows.
Change-Id: I3384e746d663004dea874db8b563612d209be11c
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
| -rwxr-xr-x | bin/qt5_tool | 6 |
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. |