1 files changed, 10 insertions, 0 deletions
diff --git a/tools/buildscripts/gyp_qtwebengine b/tools/buildscripts/gyp_qtwebengine
index b53901cc3..29d33a802 100755
--- a/tools/buildscripts/gyp_qtwebengine
+++ b/tools/buildscripts/gyp_qtwebengine
@@ -77,6 +77,16 @@ if __name__ == '__main__':
   if 'qt_cross_compile=1' in sys.argv:
     os.environ['GYP_CROSSCOMPILE'] = '1'
 
+  # On Windows we have to update the path of Chromium's Cygwin in registry to ensure current build
+  # uses Cygwin from the current source directory.
+  if sys.platform.startswith('win32'):
+    print 'Updating Cygwin\'s path in registry...'
+    setup_mount = os.path.abspath(os.path.join(chrome_src,'third_party','cygwin','setup_mount.bat'))
+    ret = subprocess.call(setup_mount)
+    if ret != 0:
+      print 'Failed to run', setup_mount
+      sys.exit(1)
+
   # On Mac we want to override CXX and CC that is provided with
   # the Chromium GYP environment.
   if sys.platform.startswith('darwin') and not 'GYP_CROSSCOMPILE' in os.environ: