Commit 4afad6e5 authored by bfulgham@apple.com's avatar bfulgham@apple.com
Browse files

[Win] Improve support for command line builds of 64-bit JSC

https://bugs.webkit.org/show_bug.cgi?id=124380

Patch by Brent Fulgham <bfulgham@apple.com> on 2013-11-14
Reviewed by David Kilzer.

* Scripts/webkitdirs.pm:
(argumentsForConfiguration): Recognize all flavors of Debug and Release (i.e., 'Debug',
'Debug|Win32', 'Debug|x64') when passing arguments to child processes.
(determinePassedConfiguration): Don't suffix configuration with "|Win32" or "|x64". That's
what the "$configurationForVisualStudio" value is for.


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@159328 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent df32d58c
2013-11-14 Brent Fulgham <bfulgham@apple.com>
[Win] Improve support for command line builds of 64-bit JSC
https://bugs.webkit.org/show_bug.cgi?id=124380
Reviewed by David Kilzer.
* Scripts/webkitdirs.pm:
(argumentsForConfiguration): Recognize all flavors of Debug and Release (i.e., 'Debug',
'Debug|Win32', 'Debug|x64') when passing arguments to child processes.
(determinePassedConfiguration): Don't suffix configuration with "|Win32" or "|x64". That's
what the "$configurationForVisualStudio" value is for.
2013-11-14 Oliver Hunt <oliver@apple.com>
 
Make CLoop easier to build, and make it work
......
......@@ -373,8 +373,8 @@ sub argumentsForConfiguration()
determineArchitecture();
my @args = ();
push(@args, '--debug') if $configuration eq "Debug";
push(@args, '--release') if $configuration eq "Release";
push(@args, '--debug') if ($configuration =~ "^Debug");
push(@args, '--release') if ($configuration =~ "^Release");
push(@args, '--32-bit') if ($architecture ne "x86_64" and !isWin64());
push(@args, '--64-bit') if (isWin64());
push(@args, '--gtk') if isGtk();
......@@ -620,24 +620,18 @@ sub determinePassedConfiguration
splice(@ARGV, $i, 1);
$passedConfiguration = "Debug";
$passedConfiguration .= "_WinCairo" if (isWinCairo() && isCygwin());
$passedConfiguration .= "|x64" if isWin64();
$passedConfiguration .= "|Win32" if isWindows() && !isWin64();
return;
}
if ($opt =~ /^--release$/i) {
splice(@ARGV, $i, 1);
$passedConfiguration = "Release";
$passedConfiguration .= "_WinCairo" if (isWinCairo() && isCygwin());
$passedConfiguration .= "|x64" if isWin64();
$passedConfiguration .= "|Win32" if isWindows() && !isWin64();
return;
}
if ($opt =~ /^--profil(e|ing)$/i) {
splice(@ARGV, $i, 1);
$passedConfiguration = "Profiling";
$passedConfiguration .= "_WinCairo" if (isWinCairo() && isCygwin());
$passedConfiguration .= "|x64" if isWin64();
$passedConfiguration .= "|Win32" if isWindows() && !isWin64();
return;
}
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment