[GTK] Make preprocessor.pm / make_names.pl work under msys/mingw

https://bugs.webkit.org/show_bug.cgi?id=143908 Patch by Milan Crha <mcrha@redhat.com> on 2015-04-17 Reviewed by Carlos Garcia Campos. * bindings/scripts/preprocessor.pm: (applyPreprocessor): * dom/make_names.pl:
WebKit · May 18, 2015 · c277bf6 · c277bf6
1 parent 7941251
commit c277bf6
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 1 deletion.
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2015-04-17  Milan Crha  <mcrha@redhat.com>
+
+        [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  <otaylor@redhat.com>
 
         [GTK] Add HighDPI support for non-accelerated compositing contents

diff --git a/Source/WebCore/bindings/scripts/preprocessor.pm b/Source/WebCore/bindings/scripts/preprocessor.pm
@@ -51,6 +51,8 @@ sub applyPreprocessor
             $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 @@ sub applyPreprocessor
     @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 {

diff --git a/Source/WebCore/dom/make_names.pl b/Source/WebCore/dom/make_names.pl
@@ -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";
 }