Title: [110054] trunk/Tools
- Revision
- 110054
- Author
- hausm...@webkit.org
- Date
- 2012-03-07 07:46:58 -0800 (Wed, 07 Mar 2012)
Log Message
[Qt] Windows build fix.
Reviewed by Tor Arne Vestbø.
Pass the -j parameter only to "make", not "nmake".
* Scripts/webkitdirs.pm:
(buildQMakeProjects):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (110053 => 110054)
--- trunk/Tools/ChangeLog 2012-03-07 15:16:01 UTC (rev 110053)
+++ trunk/Tools/ChangeLog 2012-03-07 15:46:58 UTC (rev 110054)
@@ -1,5 +1,16 @@
2012-03-07 Simon Hausmann <simon.hausm...@nokia.com>
+ [Qt] Windows build fix.
+
+ Reviewed by Tor Arne Vestbø.
+
+ Pass the -j parameter only to "make", not "nmake".
+
+ * Scripts/webkitdirs.pm:
+ (buildQMakeProjects):
+
+2012-03-07 Simon Hausmann <simon.hausm...@nokia.com>
+
[Qt] Fix compilation without QtQuick1
https://bugs.webkit.org/show_bug.cgi?id=80503
Modified: trunk/Tools/Scripts/webkitdirs.pm (110053 => 110054)
--- trunk/Tools/Scripts/webkitdirs.pm 2012-03-07 15:16:01 UTC (rev 110053)
+++ trunk/Tools/Scripts/webkitdirs.pm 2012-03-07 15:46:58 UTC (rev 110054)
@@ -2065,6 +2065,7 @@
my @buildArgs = ();
+ my $make = qtMakeCommand($qmakebin);
my $makeargs = "";
my $installHeaders;
my $installLibs;
@@ -2086,7 +2087,7 @@
}
# 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 ))) {
+ if ($make eq "make" && $makeargs !~ /-j\s*\d+/i && (!defined $ENV{"MAKEFLAGS"} || ($ENV{"MAKEFLAGS"} !~ /-j\s*\d+/i ))) {
$makeargs .= " -j" . numberOfCPUs();
}
@@ -2098,7 +2099,6 @@
$qmakecommand = "QMAKEPATH=$qmakepath $qmakebin";
}
- my $make = qtMakeCommand($qmakebin);
my $config = configuration();
push @buildArgs, "INSTALL_HEADERS=" . $installHeaders if defined($installHeaders);
push @buildArgs, "INSTALL_LIBS=" . $installLibs if defined($installLibs);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
