diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2017-04-25 14:46:46 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-05-03 16:02:10 +0200 |
| commit | 554ce554510851521c8aa2e6b6dcfcb9005266fa (patch) | |
| tree | 72cd7cd94784becb01c46352768e26ae74c3a272 | |
| parent | 7285f45ed87161485086422b235f3a832851c090 (diff) | |
| download | qtwebengine-chromium-554ce554510851521c8aa2e6b6dcfcb9005266fa.tar.gz | |
gn-build gn with exactly the python it was bootstrapped with
If bootstrap.py is called with a python2 executable but the first python
executable in PATH is a python3, then the gn-build of gn will fail.
Fix this by passing the exact python location to gn it was bootstrapped
with.
Change-Id: I17d9cd3614c3a3bee5d54a08a27b9e08d29ada4d
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
| -rwxr-xr-x | chromium/tools/gn/bootstrap/bootstrap.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/chromium/tools/gn/bootstrap/bootstrap.py b/chromium/tools/gn/bootstrap/bootstrap.py index d7d12ddfb0a..96a8495f0fb 100755 --- a/chromium/tools/gn/bootstrap/bootstrap.py +++ b/chromium/tools/gn/bootstrap/bootstrap.py @@ -771,6 +771,8 @@ def build_gn_with_gn(temp_gn, build_dir, options): if not options.debug: gn_gen_args += ' is_debug=false' cmd = [temp_gn, 'gen', build_dir, '--args=%s' % gn_gen_args] + if sys.executable: + cmd.append('--script-executable=%s' % sys.executable) check_call(cmd) cmd = ['ninja', '-C', build_dir] |