diff options
| author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2014-08-07 17:36:54 +0200 |
|---|---|---|
| committer | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2014-08-14 16:43:49 +0200 |
| commit | fcf96a61db5271473d8eca5e3de4ee406fe57ad0 (patch) | |
| tree | dbc5689fb9036b6509572d4eccf5026958564d4d | |
| parent | 65f385bb6ee8b6735d6555a396094577d44a5f82 (diff) | |
| download | qtwebengine-fcf96a61db5271473d8eca5e3de4ee406fe57ad0.tar.gz | |
Use the toolchain from PATH on Windows
We don't want to fetch the compiler path from the mkspec on Windows
the same way that we do on linux/embedded. Qt usually let the build
environment decide the MSVC toolchain, as it is usually done on
Windows.
This patch also passes the ninja_use_custom_environment_files ninja
generator option to make sure that gyp doesn't try to construct the
build environment by running the env scripts itself.
Change-Id: I6e04471eb994b81a9f1b8b5f149b4dbddbb320a8
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
| -rw-r--r-- | src/core/core.pro | 23 | ||||
| -rwxr-xr-x | tools/buildscripts/gyp_qtwebengine | 4 |
2 files changed, 18 insertions, 9 deletions
diff --git a/src/core/core.pro b/src/core/core.pro index 02a707f21..927f8bab4 100644 --- a/src/core/core.pro +++ b/src/core/core.pro @@ -4,26 +4,31 @@ TEMPLATE = subdirs # to generate our main .gyp file core_gyp_generator.file = core_gyp_generator.pro -# gyp_configure_host.pro and gyp_configure_target.pro are phony pro files that -# extract things like compiler and linker from qmake -gyp_configure_host.file = gyp_configure_host.pro -gyp_configure_target.file = gyp_configure_target.pro -gyp_configure_target.depends = gyp_configure_host - # gyp_run.pro calls gyp through gyp_qtwebengine on the qmake step, and ninja on the make step. gyp_run.file = gyp_run.pro -gyp_run.depends = core_gyp_generator gyp_configure_host gyp_configure_target +gyp_run.depends = core_gyp_generator # This will take the compile output of ninja, and link+deploy the final binary. core_module.file = core_module.pro core_module.depends = gyp_run SUBDIRS += core_gyp_generator \ - gyp_configure_host \ - gyp_configure_target \ gyp_run \ core_module +!win32 { + # gyp_configure_host.pro and gyp_configure_target.pro are phony pro files that + # extract things like compiler and linker from qmake + # Do not use them on Windows, where Qt already expects the toolchain to be + # selected through environment varibles. + gyp_configure_host.file = gyp_configure_host.pro + gyp_configure_target.file = gyp_configure_target.pro + gyp_configure_target.depends = gyp_configure_host + + gyp_run.depends += gyp_configure_host gyp_configure_target + SUBDIRS += gyp_configure_host gyp_configure_target +} + REPACK_DIR = $$OUT_PWD/$$getConfigDir()/gen/repack locales.files = "$$REPACK_DIR/qtwebengine_locales/*" locales.CONFIG += no_check_exist diff --git a/tools/buildscripts/gyp_qtwebengine b/tools/buildscripts/gyp_qtwebengine index 864506f8a..3cdacd184 100755 --- a/tools/buildscripts/gyp_qtwebengine +++ b/tools/buildscripts/gyp_qtwebengine @@ -147,6 +147,10 @@ if __name__ == '__main__': # Tweak the output location and format (hardcode ninja for now if not set) args.extend(['--generator-output', os.path.abspath(output_dir)]) args.extend(['-Goutput_dir='+ os.path.abspath(output_dir)]) + + # Tell gyp not to try finding cl.exe on Windows, Qt already requires the env to be set prior to the build. + args.extend(['-G', 'ninja_use_custom_environment_files']) + if not os.environ.get('GYP_GENERATORS'): args.extend(['--format=ninja']) if "QTWEBENGINE_GYP_DEBUG" in os.environ: |