From 08ee7d8eaa621bf88c30f3c354053625de0b0da0 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Wed, 22 Mar 2017 11:38:39 +0100 Subject: Create v8_snapshot gn toolchain from one pro file MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Merge the generation of the v8_snapshot toolchain back to being made in configure_host.pro. This is a lot cleaner and safer against errors, to make it work however we need to cache the target archicture so that it is still available with option(host_build) enabled. Change-Id: Iefed9c97528f8ce338e7a0d4fe5c6884fb4ef4bd Reviewed-by: Michael Brüning --- tools/qmake/mkspecs/features/configure.prf | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'tools/qmake/mkspecs/features') diff --git a/tools/qmake/mkspecs/features/configure.prf b/tools/qmake/mkspecs/features/configure.prf index c61cf7ebe..260e0f6d5 100644 --- a/tools/qmake/mkspecs/features/configure.prf +++ b/tools/qmake/mkspecs/features/configure.prf @@ -117,6 +117,10 @@ defineTest(runConfigure) { cache(WEBENGINE_CONFIG, add, $$list($$WEBENGINE_CONFIG)) export(WEBENGINE_CONFIG) } + # Set a global WEBENGINE_ARCH for the target architecture we can also read from option(host_build) + WEBENGINE_ARCH = $$QT_ARCH + cache(WEBENGINE_ARCH) + export(WEBENGINE_ARCH) } unix:!darwin { -- cgit v1.2.3