Title: [160422] branches/safari-537.74-branch/Tools
- Revision
- 160422
- Author
- [email protected]
- Date
- 2013-12-11 04:00:40 -0800 (Wed, 11 Dec 2013)
Log Message
Merged r159328. <rdar://problem/15560414>
Modified Paths
Diff
Modified: branches/safari-537.74-branch/Tools/ChangeLog (160421 => 160422)
--- branches/safari-537.74-branch/Tools/ChangeLog 2013-12-11 11:58:05 UTC (rev 160421)
+++ branches/safari-537.74-branch/Tools/ChangeLog 2013-12-11 12:00:40 UTC (rev 160422)
@@ -1,3 +1,20 @@
+2013-12-11 Lucas Forschler <[email protected]>
+
+ Merge r159328
+
+ 2013-11-14 Brent Fulgham <[email protected]>
+
+ [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-12-10 Lucas Forschler <[email protected]>
Merge r156928
Modified: branches/safari-537.74-branch/Tools/Scripts/webkitdirs.pm (160421 => 160422)
--- branches/safari-537.74-branch/Tools/Scripts/webkitdirs.pm 2013-12-11 11:58:05 UTC (rev 160421)
+++ branches/safari-537.74-branch/Tools/Scripts/webkitdirs.pm 2013-12-11 12:00:40 UTC (rev 160422)
@@ -384,8 +384,8 @@
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 !hasArgument('--64-bit', \@ARGV));
push(@args, '--qt') if isQt();
push(@args, '--gtk') if isGtk();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
