From 8899143612d61faa1e41faa4c0c0288b1724ffd0 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Thu, 17 Jun 2021 10:53:08 +0200 Subject: Improve toolchain generation Set is_clang and calculate v8-host arch for other hosts than x64. Change-Id: I5622839840141ed60328c8bd736e4cada3e0ecee Reviewed-by: Michal Klocek (cherry picked from commit 9196f743cec64840c711d00a8e906b480ba1451e) Reviewed-by: Qt Cherry-pick Bot --- src/host/BUILD.toolchain.gn.in | 4 ++-- src/host/CMakeLists.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/host/BUILD.toolchain.gn.in b/src/host/BUILD.toolchain.gn.in index c1bf3845b..df62aa88e 100644 --- a/src/host/BUILD.toolchain.gn.in +++ b/src/host/BUILD.toolchain.gn.in @@ -8,10 +8,10 @@ gcc_toolchain("@GN_TOOLCHAIN@") { nm = "@CMAKE_NM@" extra_cppflags = "" toolchain_args = { - current_os = "linux" + current_os = "@GN_OS@" current_cpu = "@GN_CPU@" v8_current_cpu = "@GN_V8_CPU@" - is_clang = false + is_clang = @GN_IS_CLANG@ use_gold = false } } diff --git a/src/host/CMakeLists.txt b/src/host/CMakeLists.txt index 86249d74c..9053d1e59 100644 --- a/src/host/CMakeLists.txt +++ b/src/host/CMakeLists.txt @@ -23,7 +23,7 @@ configure_gn_toolchain(host ${TEST_architecture_arch} ${TEST_architecture_arch} ${WEBENGINE_ROOT_SOURCE_DIR}/src/host/BUILD.toolchain.gn.in ${buildDir}/host_toolchain ) -get_v8_arch(GN_V8_HOST_CPU ${GN_TARGET_CPU}) +get_v8_arch(GN_V8_HOST_CPU ${GN_TARGET_CPU} ${TEST_architecture_arch}) configure_gn_toolchain(v8 ${GN_V8_HOST_CPU} ${GN_TARGET_CPU} ${WEBENGINE_ROOT_SOURCE_DIR}/src/host/BUILD.toolchain.gn.in ${buildDir}/v8_toolchain) -- cgit v1.2.3