From 409cf1ca43dc2b71db42fa15eb9461dd2b3a6c22 Mon Sep 17 00:00:00 2001
From: "achristensen@apple.com"
 <achristensen@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed, 16 Sep 2015 19:55:15 +0000
Subject: [PATCH] Cygwin build fix after r189875

* Scripts/build-webkit:
* Scripts/webkitdirs.pm:
(jhbuildWrapperPrefixIfNeeded):
(generateBuildSystemFromCMakeProject):
Make things work with cygwin and cmake.



git-svn-id: https://svn.webkit.org/repository/webkit/trunk@189878 268f45cc-cd09-0410-ab3c-d52691b4dbfc
---
 Tools/ChangeLog             | 10 ++++++++++
 Tools/Scripts/build-webkit  |  2 +-
 Tools/Scripts/webkitdirs.pm |  5 +++--
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 8d7b810..1a6561c 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,5 +1,15 @@
 2015-09-16  Alex Christensen  <achristensen@webkit.org>
 
+        Cygwin build fix after r189875
+
+        * Scripts/build-webkit:
+        * Scripts/webkitdirs.pm:
+        (jhbuildWrapperPrefixIfNeeded):
+        (generateBuildSystemFromCMakeProject):
+        Make things work with cygwin and cmake.
+
+2015-09-16  Alex Christensen  <achristensen@webkit.org>
+
         Switch AppleWin build to use CMake
         https://bugs.webkit.org/show_bug.cgi?id=149163
 
diff --git a/Tools/Scripts/build-webkit b/Tools/Scripts/build-webkit
index 1d6a64b..6dfc7ca 100755
--- a/Tools/Scripts/build-webkit
+++ b/Tools/Scripts/build-webkit
@@ -256,7 +256,7 @@ for my $dir (@projects) {
         $result = buildXCodeProject($projectPath, $clean, @local_options, @ARGV);
     } elsif (isAppleWinWebKit() || isWinCairo()) {
         chdirWebKit();
-        if (exitStatus(generateBuildSystemFromCMakeProject("WinCairo"))) {
+        if (exitStatus(generateBuildSystemFromCMakeProject(isWinCairo() ? "WinCairo" : "AppleWin"))) {
             die "Run \"C:/Program Files (x86)/Microsoft Visual Studio 12.0/VC/vcvarsall.bat\" before build-webkit when using ninja";
         }
         if (canUseNinja()) {
diff --git a/Tools/Scripts/webkitdirs.pm b/Tools/Scripts/webkitdirs.pm
index 2202922..80aa283 100755
--- a/Tools/Scripts/webkitdirs.pm
+++ b/Tools/Scripts/webkitdirs.pm
@@ -1723,7 +1723,7 @@ sub isCachedArgumentfileOutOfDate($@)
 
 sub jhbuildWrapperPrefixIfNeeded()
 {
-    if (isWindows()) {
+    if (isWindows() || isCygwin()) {
         return ();
     }
     if (-e getJhbuildPath()) {
@@ -1859,7 +1859,8 @@ sub generateBuildSystemFromCMakeProject
     push @args, @cmakeArgs if @cmakeArgs;
     push @args, $additionalCMakeArgs if $additionalCMakeArgs;
 
-    push @args, '"' . sourceDir() . '"';
+    my $cmakeSourceDir = isCygwin() ? windowsSourceDir() : sourceDir();
+    push @args, '"' . $cmakeSourceDir . '"';
 
     # Compiler options to keep floating point values consistent
     # between 32-bit and 64-bit architectures.
-- 
1.8.3.1