From 393692f7bca587d0d97eecb45b5a65f2bf5cac7d Mon Sep 17 00:00:00 2001 From: Zoltan Arvai Date: Thu, 3 Apr 2014 13:16:45 +0200 Subject: Run cygwin configurator before build on Windows Running setup_mount will ensure that every build uses it's own cygwin and prevents mixup with other instance. Update 3rdparty's shasum. Change-Id: Ic8f25ce7c6077318bac36b15cfe23a5a27ed51b9 Reviewed-by: Andras Becsi --- tools/buildscripts/gyp_qtwebengine | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'tools/buildscripts') 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: -- cgit v1.2.3