Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
2009-03-19 Gustavo Noronha Silva <gns@gnome.org>
Reviewed by Mark Rowe.

        Make determinePassedArchitecture always consume the --32-bit
        option, also in non-AppleMacWebkit platforms. Solution pointed out
        by Mark Rowe.

        * Scripts/webkitdirs.pm:

Canonical link: https://commits.webkit.org/33901@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@41844 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
kov committed Mar 19, 2009
1 parent b7bdfa0 commit 3f5e896
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 4 deletions.
10 changes: 10 additions & 0 deletions WebKitTools/ChangeLog
@@ -1,3 +1,13 @@
2009-03-19 Gustavo Noronha Silva <gns@gnome.org>

Reviewed by Mark Rowe.

Make determinePassedArchitecture always consume the --32-bit
option, also in non-AppleMacWebkit platforms. Solution pointed out
by Mark Rowe.

* Scripts/webkitdirs.pm:

2009-03-19 Mark Rowe <mrowe@apple.com>

Reviewed by Oliver Hunt.
Expand Down
8 changes: 4 additions & 4 deletions WebKitTools/Scripts/webkitdirs.pm
Expand Up @@ -377,14 +377,14 @@ sub determinePassedArchitecture
return if $searchedForPassedArchitecture;
$searchedForPassedArchitecture = 1;

return unless isAppleMacWebKit();

for my $i (0 .. $#ARGV) {
my $opt = $ARGV[$i];
if ($opt =~ /^--32-bit$/i) {
splice(@ARGV, $i, 1);
$passedArchitecture = `arch`;
chomp $passedArchitecture;
if (isAppleMacWebKit()) {
$passedArchitecture = `arch`;
chomp $passedArchitecture;
}
return;
}
}
Expand Down

0 comments on commit 3f5e896

Please sign in to comment.