Title: [109108] trunk/Tools
- Revision
- 109108
- Author
- [email protected]
- Date
- 2012-02-28 08:27:09 -0800 (Tue, 28 Feb 2012)
Log Message
[Qt] build-webkit does not detect the number of CPUs
https://bugs.webkit.org/show_bug.cgi?id=76445
Based on Seo Sanghyeon's work (modification:
Automatically determine the number of CPUs for make
only if -j make argument haven't already been specified.)
Patch by János Badics <[email protected]> on 2012-02-28
Reviewed by Csaba Osztrogonác.
* Scripts/webkitdirs.pm:
(buildQMakeProjects):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (109107 => 109108)
--- trunk/Tools/ChangeLog 2012-02-28 16:18:58 UTC (rev 109107)
+++ trunk/Tools/ChangeLog 2012-02-28 16:27:09 UTC (rev 109108)
@@ -1,3 +1,17 @@
+2012-02-28 János Badics <[email protected]>
+
+ [Qt] build-webkit does not detect the number of CPUs
+ https://bugs.webkit.org/show_bug.cgi?id=76445
+
+ Based on Seo Sanghyeon's work (modification:
+ Automatically determine the number of CPUs for make
+ only if -j make argument haven't already been specified.)
+
+ Reviewed by Csaba Osztrogonác.
+
+ * Scripts/webkitdirs.pm:
+ (buildQMakeProjects):
+
2012-02-28 Kent Tamura <[email protected]>
Update a pattern for forms files of watchlist
Modified: trunk/Tools/Scripts/webkitdirs.pm (109107 => 109108)
--- trunk/Tools/Scripts/webkitdirs.pm 2012-02-28 16:18:58 UTC (rev 109107)
+++ trunk/Tools/Scripts/webkitdirs.pm 2012-02-28 16:27:09 UTC (rev 109108)
@@ -2084,6 +2084,11 @@
}
}
+ # Automatically determine the number of CPUs for make only if this make argument haven't already been specified.
+ if ($makeargs !~ /-j\s*\d+/i && (!defined $ENV{"MAKEFLAGS"} || ($ENV{"MAKEFLAGS"} !~ /-j\s*\d+/i ))) {
+ $makeargs .= " -j" . numberOfCPUs();
+ }
+
my $qmakepath = File::Spec->catfile(sourceDir(), "Tools", "qmake");
my $qmakecommand;
if (isWindows()) {
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
