summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2017-03-22 11:38:39 +0100
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2017-03-25 20:42:21 +0000
commit08ee7d8eaa621bf88c30f3c354053625de0b0da0 (patch)
tree8a06d97c9feef96b3dfae556fe4ed974d9ae920f /tools
parent3a463740b2026767b87662d70b9aa5a2c85115e5 (diff)
Create v8_snapshot gn toolchain from one pro file
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 <michael.bruning@qt.io>
Diffstat (limited to 'tools')
-rw-r--r--tools/qmake/mkspecs/features/configure.prf4
1 files changed, 4 insertions, 0 deletions
diff --git a/tools/qmake/mkspecs/features/configure.prf b/tools/qmake/mkspecs/features/configure.prf
index c61cf7eb..260e0f6d 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 {