Title: [157303] trunk/Tools
- Revision
- 157303
- Author
- [email protected]
- Date
- 2013-10-11 09:46:51 -0700 (Fri, 11 Oct 2013)
Log Message
Unreviewed build fix for --64-bit target.
* Scripts/webkitdirs.pm:
(argumentsForConfiguration): Use 'isWin64' test, since @ARGV value may have
been removed by this point.
(hasArgument): Remove unused temporary.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (157302 => 157303)
--- trunk/Tools/ChangeLog 2013-10-11 16:34:25 UTC (rev 157302)
+++ trunk/Tools/ChangeLog 2013-10-11 16:46:51 UTC (rev 157303)
@@ -1,3 +1,12 @@
+2013-10-11 Brent Fulgham <[email protected]>
+
+ Unreviewed build fix for --64-bit target.
+
+ * Scripts/webkitdirs.pm:
+ (argumentsForConfiguration): Use 'isWin64' test, since @ARGV value may have
+ been removed by this point.
+ (hasArgument): Remove unused temporary.
+
2013-10-10 Gustavo Noronha Silva <[email protected]>
webkit-patch failure-reason has a quite low limit for 'too many failures'
Modified: trunk/Tools/Scripts/webkitdirs.pm (157302 => 157303)
--- trunk/Tools/Scripts/webkitdirs.pm 2013-10-11 16:34:25 UTC (rev 157302)
+++ trunk/Tools/Scripts/webkitdirs.pm 2013-10-11 16:46:51 UTC (rev 157303)
@@ -375,7 +375,8 @@
my @args = ();
push(@args, '--debug') if $configuration eq "Debug";
push(@args, '--release') if $configuration eq "Release";
- push(@args, '--32-bit') if ($architecture ne "x86_64" and !hasArgument('--64-bit', \@ARGV));
+ push(@args, '--32-bit') if ($architecture ne "x86_64" and !isWin64());
+ push(@args, '--64-bit') if ($architecture eq "x86_64" or isWin64());
push(@args, '--gtk') if isGtk();
push(@args, '--efl') if isEfl();
push(@args, '--wincairo') if isWinCairo();
@@ -883,7 +884,6 @@
{
my ($argToCheck, $arrayRef) = @_;
my @matchingIndices = findMatchingArguments($argToCheck, $arrayRef);
- my $far = scalar @matchingIndices;
return scalar @matchingIndices > 0;
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
