summaryrefslogtreecommitdiffstats
path: root/tools/buildscripts
diff options
context:
space:
mode:
authorZoltan Arvai <zarvai@inf.u-szeged.hu>2014-04-03 13:16:45 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-04-03 21:52:13 +0200
commit393692f7bca587d0d97eecb45b5a65f2bf5cac7d (patch)
tree1dd14565048a095ac40ac30e7605b3f0bee704e4 /tools/buildscripts
parent174c076bba4444067bb55341181f92f095e449a0 (diff)
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 <andras.becsi@digia.com>
Diffstat (limited to 'tools/buildscripts')
-rwxr-xr-xtools/buildscripts/gyp_qtwebengine10
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: