From fcf96a61db5271473d8eca5e3de4ee406fe57ad0 Mon Sep 17 00:00:00 2001 From: Jocelyn Turcotte Date: Thu, 7 Aug 2014 17:36:54 +0200 Subject: 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 --- tools/buildscripts/gyp_qtwebengine | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'tools') 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: -- cgit v1.2.3