diff options
| author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2014-08-07 19:18:06 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-05-10 16:11:53 +0200 |
| commit | 7eca26d7b005fcb05a4941709d6023af46c20b2a (patch) | |
| tree | 7511d47abb10af644118e7a2ad3bb18fac5a7b52 | |
| parent | 5a4b650feb47e2ef0bacfbcba6204543f4817b47 (diff) | |
| download | qtwebengine-chromium-7eca26d7b005fcb05a4941709d6023af46c20b2a.tar.gz | |
<tools/gyp> Fix ninja_use_custom_environment_files
We want to use this option to prevent gyp from detecting the MSVC
toolchain by itself. We already require the environment to be setup
according to the desired toolchain for Qt, and we should respect it
when it's time to build QtWebEngine through gyp.
win_tool.py currently expects the environment.<arch> file to be
present. Fix the issue by copying in this file the whole environment
at the gyp invocation time instead of from an invocation of the
setup script when ninja_use_custom_environment_files isn't used.
Change-Id: Iade4c488e1af5cab8306e9070c73d42ec67a955a
Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
Reviewed-by: Jocelyn Turcotte (Woboq GmbH) <jturcotte@woboq.com>
Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
| -rw-r--r-- | chromium/tools/gyp/pylib/gyp/msvs_emulation.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/chromium/tools/gyp/pylib/gyp/msvs_emulation.py b/chromium/tools/gyp/pylib/gyp/msvs_emulation.py index e4a85a96e6c..195db089e7b 100644 --- a/chromium/tools/gyp/pylib/gyp/msvs_emulation.py +++ b/chromium/tools/gyp/pylib/gyp/msvs_emulation.py @@ -1024,6 +1024,10 @@ def GenerateEnvironmentFiles(toplevel_build_dir, generator_flags, cl_paths = {} for arch in archs: cl_paths[arch] = 'cl.exe' + env_block = _FormatAsEnvironmentBlock(os.environ) + f = open_out(os.path.join(toplevel_build_dir, 'environment.' + arch), 'wb') + f.write(env_block) + f.close() return cl_paths vs = GetVSVersion(generator_flags) cl_paths = {} |