Title: [160443] branches/safari-537.74-branch/Tools/Scripts/webkitdirs.pm
- Revision
- 160443
- Author
- [email protected]
- Date
- 2013-12-11 10:05:53 -0800 (Wed, 11 Dec 2013)
Log Message
Merge 157303: <rdar://problem/15498872>.
Modified Paths
Diff
Modified: branches/safari-537.74-branch/Tools/Scripts/webkitdirs.pm (160442 => 160443)
--- branches/safari-537.74-branch/Tools/Scripts/webkitdirs.pm 2013-12-11 18:01:32 UTC (rev 160442)
+++ branches/safari-537.74-branch/Tools/Scripts/webkitdirs.pm 2013-12-11 18:05:53 UTC (rev 160443)
@@ -386,7 +386,8 @@
my @args = ();
push(@args, '--debug') if ($configuration =~ "^Debug");
push(@args, '--release') if ($configuration =~ "^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, '--qt') if isQt();
push(@args, '--gtk') if isGtk();
push(@args, '--efl') if isEfl();
@@ -970,7 +971,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
