diff options
m--------- | src/3rdparty | 0 | ||||
-rwxr-xr-x | tools/buildscripts/gyp_qtwebengine | 10 |
2 files changed, 10 insertions, 0 deletions
diff --git a/src/3rdparty b/src/3rdparty -Subproject d12a5818c08a6e4ca207a0bb1688cb4d82c2046 +Subproject a6014652040e76de08e643b49b69fc97cb5bfd6 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: |