From 9d0209892e522830326f350bf6c0b49f260e3add Mon Sep 17 00:00:00 2001 From: Michal Klocek Date: Mon, 27 Mar 2023 18:42:00 +0200 Subject: 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 (cherry picked from commit 8dfb4a3c514e2fcb6b65684c8e263ff180c6d06b) Reviewed-by: Qt Cherry-pick Bot --- cmake/Functions.cmake | 6 ++++-- 1 file 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() -- cgit v1.2.1