From 61de0e721f672e854551a8938d2d42ba946398cf Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
Date: Wed, 6 Oct 2021 17:06:14 +0200
Subject: Adaptations for Chromium 94

Change-Id: I9fb8998a3a7762b0aea70993ca231f0bbf4f7761
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
---
 cmake/Functions.cmake | 15 ++++++++++-----
 cmake/Gn.cmake        |  4 ++--
 2 files changed, 12 insertions(+), 7 deletions(-)

(limited to 'cmake')

diff --git a/cmake/Functions.cmake b/cmake/Functions.cmake
index 6c7a49415..07791e0e9 100644
--- a/cmake/Functions.cmake
+++ b/cmake/Functions.cmake
@@ -429,16 +429,21 @@ function(add_rsp_command target buildDir)
     add_custom_command(
         OUTPUT ${buildDir}/${cmakeTarget}.a
         BYPRODUCTS
-            ${buildDir}/${cmakeTarget}.o
+            ${buildDir}/${cmakeTarget}_objs.o
+            ${buildDir}/${cmakeTarget}_arcs.o
         COMMAND clang++ -r -nostdlib -arch ${arch}
-            -o ${buildDir}/${cmakeTarget}.o
+            -o ${buildDir}/${cmakeTarget}_objs.o
             -Wl,-keep_private_externs
             @${buildDir}/${ninjaTarget}_objects.rsp
+        COMMAND clang++ -r -nostdlib -arch ${arch}
+            -o ${buildDir}/${cmakeTarget}_arcs.o
+            -Wl,-keep_private_externs
             -Wl,-all_load
             @${buildDir}/${ninjaTarget}_archives.rsp
-        COMMAND ar -cr
+        COMMAND ar -crs
             ${buildDir}/${cmakeTarget}.a
-            ${buildDir}/${cmakeTarget}.o
+            ${buildDir}/${cmakeTarget}_objs.o
+            ${buildDir}/${cmakeTarget}_arcs.o
         DEPENDS
             ${buildDir}/${ninjaTarget}.stamp
         WORKING_DIRECTORY "${buildDir}/../../.."
@@ -725,7 +730,7 @@ macro(append_build_type_setup)
 
     extend_gn_list(gnArgArg
         ARGS enable_precompiled_headers
-        CONDITION BUILD_WITH_PCH
+        CONDITION BUILD_WITH_PCH AND NOT LINUX
     )
     extend_gn_list(gnArgArg
         ARGS dcheck_always_on
diff --git a/cmake/Gn.cmake b/cmake/Gn.cmake
index e8dc956ee..6795cbed4 100644
--- a/cmake/Gn.cmake
+++ b/cmake/Gn.cmake
@@ -15,7 +15,7 @@ include(${WEBENGINE_ROOT_SOURCE_DIR}/cmake/Functions.cmake)
 set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR})
 
 find_package(Gn ${QT_REPO_MODULE_VERSION} EXACT)
-find_package(Python2 2.7.5 REQUIRED)
+find_package(Python3 3.7 REQUIRED)
 
 set(gnCmd ${Gn_EXECUTABLE})
 set(buildDir ${BUILD_DIR})
@@ -39,7 +39,7 @@ configure_gn_target(
 )
 
 list(APPEND gnArg
-     --script-executable=${Python2_EXECUTABLE}
+     --script-executable=${Python3_EXECUTABLE}
      --root=${WEBENGINE_ROOT_SOURCE_DIR}/src/3rdparty/chromium)
 
 STRING(REGEX REPLACE "\n" ";" printArgArg "${gnArgArg}")
-- 
cgit v1.2.1