summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael BrĂ¼ning <michael.bruning@digia.com>2014-09-03 16:30:56 +0200
committerJocelyn Turcotte <jocelyn.turcotte@digia.com>2014-09-03 17:27:22 +0200
commit09e53e79c6212f0981eb0223d80acd070eedd491 (patch)
tree8b2db3ad120bf22336c6db5e0ed8dc25097e62f3
parent264146943901af408a967ee1f5490c7319a42fa8 (diff)
[Win] Add gnuwin32\bin directory to PATH.
This is necessary for finding gperf, bison, yacc, etc. on Windows. Works only if the gnuwin32 directory is on the same level as the qtwebengine root directory, which is the case with a qt checkout. Change-Id: I09fe1523d4e4baca6612f1039bbba2e2ff9d87c0 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
-rwxr-xr-xtools/buildscripts/gyp_qtwebengine5
1 files changed, 5 insertions, 0 deletions
diff --git a/tools/buildscripts/gyp_qtwebengine b/tools/buildscripts/gyp_qtwebengine
index e3fb740c..eb44477e 100755
--- a/tools/buildscripts/gyp_qtwebengine
+++ b/tools/buildscripts/gyp_qtwebengine
@@ -21,6 +21,11 @@ if not os.path.isdir(script_dir):
sys.exit(1)
root_dir = os.path.normcase(os.path.abspath(os.path.join(os.getcwd(), os.pardir, os.pardir)))
+if sys.platform in ('cygwin', 'win32'):
+ gnuwin_tools_dir = os.path.normcase(os.path.abspath(os.path.join(qtwebengine_root, "../gnuwin32/bin")))
+ if os.path.isdir(gnuwin_tools_dir):
+ os.environ['PATH'] = gnuwin_tools_dir + os.pathsep + os.environ['PATH']
+
sys.path.insert(1, script_dir)
import gyp_helper
sys.path.insert(1, os.path.join(chrome_src, 'tools', 'gyp', 'pylib'))