diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2022-06-20 12:51:32 +0200 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2022-06-20 20:55:07 +0200 |
| commit | 71562a62c502b34f8401d436c60a6359973c3ce6 (patch) | |
| tree | 8aa4278c72feadd1f3a5a7db60cddec29fa9358f | |
| parent | 1da56888ac5815a68e31d113a8022993a40b9f8f (diff) | |
FIXUP: Add workaround for unstable gn on macOS in ci
In 5.15 we have sparate coded gn call for qtpdf.
This commit amends 41e94fc482eca3e40082c34d8332821a15aefba0
Change-Id: I2b9c7ed1e0c539006fbcac656aa8673a0f00d8b9
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| -rw-r--r-- | src/pdf/gn_run.pro | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/pdf/gn_run.pro b/src/pdf/gn_run.pro index d00406193..0e559472a 100644 --- a/src/pdf/gn_run.pro +++ b/src/pdf/gn_run.pro @@ -43,6 +43,11 @@ build_pass|!debug_and_release { ninjaflags = $$(NINJAFLAGS) isEmpty(ninjaflags):!silent: ninjaflags = "-v" + enableThreads = $$(GN_MORE_THREADS) + isEmpty(enableThreads):macos { + gn_threads = "--threads=1" + } + build_pass:build_all: default_target.target = all else: default_target.target = first default_target.depends = runninja @@ -54,7 +59,7 @@ build_pass|!debug_and_release { gn_target = "qtwebengine_target=\"$$system_path($$OUT_PWD/$$arch/$$getConfigDir()):QtPdf\"" gn_args_per_arch = $$system_quote($$gn_args $$gn_target target_cpu=\"$$gnArch($$arch)\") gn_build_root = $$system_quote($$system_path($$OUT_PWD/$$arch/$$getConfigDir())) - gn_run = $$gn_binary gen $$gn_build_root $$gn_python --args=$$gn_args_per_arch --root=$$gn_src_root + gn_run = $$gn_binary gen $$gn_build_root $$gn_python $$gn_threads --args=$$gn_args_per_arch --root=$$gn_src_root message("Running for $$arch: $$gn_run") !system($$gn_run) { error("GN run error for $$arch!") @@ -68,8 +73,8 @@ build_pass|!debug_and_release { gn_args+= "qtwebengine_target=\"$$system_path($$OUT_PWD/$$getConfigDir()):QtPdf\"" gn_args = $$system_quote($$gn_args) gn_build_root = $$system_quote($$system_path($$OUT_PWD/$$getConfigDir())) - gn_run = $$gn_binary gen $$gn_build_root $$gn_python --args=$$gn_args --root=$$gn_src_root - message("Running: $$gn_run for $$arch") + gn_run = $$gn_binary gen $$gn_build_root $$gn_python $$gn_threads --args=$$gn_args --root=$$gn_src_root + message("Running: $$gn_run") !system($$gn_run) { error("GN run error!") } |