blob: e3c4bd5cb4b93a10dcd62b52e6d88ea81d45847e (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
|
From 7c16e38b85e514991d57802136de498ac1201bca 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
Bitbake knows how to generate working toolchains, use those instead of
ones done by webengine. No need to use separate host pkg-wrapper with
these toolchain.
Upstream-Status: Inappropriate [embedder specific]
Change-Id: I217c9122144f25bb2d28717e7248c2a51b149127
---
cmake/Functions.cmake | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/cmake/Functions.cmake b/cmake/Functions.cmake
index 37fd593a..2654cdc3 100644
--- a/cmake/Functions.cmake
+++ b/cmake/Functions.cmake
@@ -642,7 +642,7 @@ endfunction()
macro(create_pkg_config_host_wrapper buildDir)
find_package(PkgConfigHost)
- if(CMAKE_CROSSCOMPILING)
+ if(FALSE)
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()
@@ -855,9 +855,9 @@ endmacro()
macro(append_toolchain_setup)
if(LINUX)
list(APPEND gnArgArg
- custom_toolchain="${buildDir}/target_toolchain:target"
- host_toolchain="${buildDir}/host_toolchain:host"
- v8_snapshot_toolchain="${buildDir}/v8_toolchain:v8"
+ custom_toolchain="//build/toolchain/yocto:yocto_target"
+ 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)
|
