webengine: update patch

Change-Id: I2c9df3bde7b0c6776cfd3a32093047fad1bd7256
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit 7e80a1296c)
This commit is contained in:
Mikko Gronoff 2023-12-22 10:54:09 +02:00
parent 52920bf035
commit db212391c0

View File

@ -1,4 +1,4 @@
From 4d67f51e36438c6edd62de296bd6823f03939c62 Mon Sep 17 00:00:00 2001
From efa68fdedbec60380946f69a6a2f985958148e83 Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Wed, 18 Aug 2021 15:09:41 +0300
Subject: [PATCH] CMake: use generated yocto toolchains
@ -16,7 +16,7 @@ Change-Id: I217c9122144f25bb2d28717e7248c2a51b149127
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/cmake/Functions.cmake b/cmake/Functions.cmake
index 0dc66c389..fe478db3b 100644
index 3371e5ff5..ac889d3f7 100644
--- a/cmake/Functions.cmake
+++ b/cmake/Functions.cmake
@@ -819,7 +819,7 @@ endfunction()
@ -28,9 +28,9 @@ index 0dc66c389..fe478db3b 100644
create_pkg_config_wrapper("${buildDir}/pkg-config-host_wrapper.sh" "${PKG_CONFIG_HOST_EXECUTABLE}")
set(PKG_CONFIG_HOST_EXECUTABLE "${buildDir}/pkg-config-host_wrapper.sh")
endif()
@@ -1075,15 +1075,13 @@ macro(append_toolchain_setup)
endif()
if(LINUX)
@@ -1097,14 +1097,12 @@ macro(append_toolchain_setup)
elseif(LINUX)
get_gn_arch(cpu ${TEST_architecture_arch})
list(APPEND gnArgArg
- custom_toolchain="${buildDir}/target_toolchain:target"
- host_toolchain="${buildDir}/host_toolchain:host"
@ -38,7 +38,6 @@ index 0dc66c389..fe478db3b 100644
+ host_toolchain="//build/toolchain/yocto:yocto_native"
+ v8_snapshot_toolchain="//build/toolchain/yocto:yocto_target"
)
get_gn_arch(cpu ${TEST_architecture_arch})
if(CMAKE_CROSSCOMPILING)
- list(APPEND gnArgArg
- v8_snapshot_toolchain="${buildDir}/v8_toolchain:v8"
@ -49,10 +48,10 @@ index 0dc66c389..fe478db3b 100644
list(APPEND gnArgArg host_cpu="${cpu}")
endif()
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a7935e7de..0734452cd 100644
index 0084697f2..1c9059ae6 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -160,7 +160,7 @@ endif()
@@ -161,7 +161,7 @@ endif()
# HOST PROJECT
##