Title: [184470] releases/WebKitGTK/webkit-2.4/Source/WebCore
- Revision
- 184470
- Author
- [email protected]
- Date
- 2015-05-18 06:54:28 -0700 (Mon, 18 May 2015)
Log Message
[GTK] Make preprocessor.pm / make_names.pl work under msys/mingw
https://bugs.webkit.org/show_bug.cgi?id=143908
Patch by Milan Crha <[email protected]> on 2015-04-17
Reviewed by Carlos Garcia Campos.
* bindings/scripts/preprocessor.pm:
(applyPreprocessor):
* dom/make_names.pl:
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog (184469 => 184470)
--- releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog 2015-05-18 13:46:08 UTC (rev 184469)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog 2015-05-18 13:54:28 UTC (rev 184470)
@@ -1,3 +1,14 @@
+2015-04-17 Milan Crha <[email protected]>
+
+ [GTK] Make preprocessor.pm / make_names.pl work under msys/mingw
+ https://bugs.webkit.org/show_bug.cgi?id=143908
+
+ Reviewed by Carlos Garcia Campos.
+
+ * bindings/scripts/preprocessor.pm:
+ (applyPreprocessor):
+ * dom/make_names.pl:
+
2014-05-29 Owen Taylor <[email protected]>
[GTK] Add HighDPI support for non-accelerated compositing contents
Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/bindings/scripts/preprocessor.pm (184469 => 184470)
--- releases/WebKitGTK/webkit-2.4/Source/WebCore/bindings/scripts/preprocessor.pm 2015-05-18 13:46:08 UTC (rev 184469)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/bindings/scripts/preprocessor.pm 2015-05-18 13:54:28 UTC (rev 184470)
@@ -51,6 +51,8 @@
$preprocessor = "/usr/sfw/bin/gcc";
} elsif (-x "/usr/bin/clang") {
$preprocessor = "/usr/bin/clang";
+ } elsif ($Config{osname} eq 'msys') {
+ $preprocessor = "gcc";
} else {
$preprocessor = "/usr/bin/gcc";
}
@@ -71,7 +73,7 @@
@macros = map { "-D$_" } @macros;
my $pid = 0;
- if ($Config{osname} eq "cygwin" || $Config{osname} eq 'MSWin32') {
+ if ($Config{osname} eq "cygwin" || $Config{osname} eq 'MSWin32' || $Config{osname} eq 'msys') {
# This call can fail if Windows rebases cygwin, so retry a few times until it succeeds.
for (my $tries = 0; !$pid && ($tries < 20); $tries++) {
eval {
Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/dom/make_names.pl (184469 => 184470)
--- releases/WebKitGTK/webkit-2.4/Source/WebCore/dom/make_names.pl 2015-05-18 13:46:08 UTC (rev 184469)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/dom/make_names.pl 2015-05-18 13:54:28 UTC (rev 184470)
@@ -69,6 +69,8 @@
$gccLocation = "/usr/sfw/bin/gcc";
} elsif ($Config::Config{"osname"} eq "darwin" && $ENV{SDKROOT}) {
chomp($gccLocation = `xcrun -find cc -sdk '$ENV{SDKROOT}'`);
+} elsif ($Config::Config{"osname"} eq "msys") {
+ $gccLocation = "gcc";
} else {
$gccLocation = "/usr/bin/cc";
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
