diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2023-03-27 18:42:00 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-05-03 14:42:36 +0000 |
| commit | 9d0209892e522830326f350bf6c0b49f260e3add (patch) | |
| tree | 4eefbced7cf8198a36c119db6383dcf90f5b075c | |
| parent | 852efb1195bf7e24dde25bb861394cd679bd4ade (diff) | |
| download | qtwebengine-9d0209892e522830326f350bf6c0b49f260e3add.tar.gz | |
Do not provide v8 snapshot toolchain if not needed
We should provide v8 snapshot toolchain only in case of cross
compilation, otherwise gn can simply use current toolchain for
creating v8 snapshot generator.
This prevents triggering second pointless build of v8 and blink
to generate snapshot of v8 context for desktop builds.
Change-Id: I214b8b802c6827fbece3b2158f206b65fb768288
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
(cherry picked from commit 8dfb4a3c514e2fcb6b65684c8e263ff180c6d06b)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | cmake/Functions.cmake | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/cmake/Functions.cmake b/cmake/Functions.cmake index 25997d7f1..56f13f2ae 100644 --- a/cmake/Functions.cmake +++ b/cmake/Functions.cmake @@ -1048,11 +1048,13 @@ macro(append_toolchain_setup) list(APPEND gnArgArg custom_toolchain="${buildDir}/target_toolchain:target" host_toolchain="${buildDir}/host_toolchain:host" - v8_snapshot_toolchain="${buildDir}/v8_toolchain:v8" ) get_gn_arch(cpu ${TEST_architecture_arch}) if(CMAKE_CROSSCOMPILING) - list(APPEND gnArgArg target_cpu="${cpu}") + list(APPEND gnArgArg + v8_snapshot_toolchain="${buildDir}/v8_toolchain:v8" + target_cpu="${cpu}" + ) else() list(APPEND gnArgArg host_cpu="${cpu}") endif() |