summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--cmake/Functions.cmake1
-rw-r--r--cmake/Gn.cmake4
-rw-r--r--coin/module_config.yaml7
3 files changed, 12 insertions, 0 deletions
diff --git a/cmake/Functions.cmake b/cmake/Functions.cmake
index 7955aab8f..5fd08c8ba 100644
--- a/cmake/Functions.cmake
+++ b/cmake/Functions.cmake
@@ -1128,6 +1128,7 @@ function(add_gn_command)
-DMODULE=${arg_MODULE}
-DQT_HOST_GN_PATH=${QT_HOST_GN_PATH}
-DPython2_EXECUTABLE=${Python2_EXECUTABLE}
+ -DGN_THREADS=$ENV{QTWEBENGINE_GN_THREADS}
-P ${WEBENGINE_ROOT_SOURCE_DIR}/cmake/Gn.cmake
WORKING_DIRECTORY ${WEBENGINE_ROOT_BUILD_DIR}
COMMENT "Run gn for target ${arg_CMAKE_TARGET} in ${arg_BUILDDIR}"
diff --git a/cmake/Gn.cmake b/cmake/Gn.cmake
index 7e40640e6..b00cbaa2f 100644
--- a/cmake/Gn.cmake
+++ b/cmake/Gn.cmake
@@ -42,6 +42,10 @@ list(APPEND gnArg
--script-executable=${Python2_EXECUTABLE}
--root=${WEBENGINE_ROOT_SOURCE_DIR}/src/3rdparty/chromium)
+if(GN_THREADS)
+ list(APPEND gnArg --threads=${GN_THREADS})
+endif()
+
STRING(REGEX REPLACE "\n" ";" printArgArg "${gnArgArg}")
LIST(SORT printArgArg)
STRING(REGEX REPLACE ";" "\n" printArgArg "${printArgArg}")
diff --git a/coin/module_config.yaml b/coin/module_config.yaml
index 741558a5a..a40f566c3 100644
--- a/coin/module_config.yaml
+++ b/coin/module_config.yaml
@@ -12,6 +12,13 @@ instructions:
- type: EnvironmentVariable
variableName: CMAKE_BUILD_OUTPUT_TIMEOUT
variableValue: "3600"
+ - type: EnvironmentVariable
+ variableName: QTWEBENGINE_GN_THREADS
+ variableValue: "1"
+ enable_if:
+ condition: property
+ property: host.os
+ equals_value: MacOS
- !include "{{qt/qtbase}}/coin_module_build_template_v2.yaml"
Test:
- type: EnvironmentVariable