diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/core_module.pro | 2 | ||||
| -rw-r--r-- | src/core/gn_run.pro | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/core/core_module.pro b/src/core/core_module.pro index b02fb51f8..d2506e343 100644 --- a/src/core/core_module.pro +++ b/src/core/core_module.pro @@ -128,7 +128,7 @@ icu.files = $$OUT_PWD/$$getConfigDir()/icudtl.dat } } -!win32:!build_pass:debug_and_release { +!build_pass:debug_and_release { # Special GNU make target that ensures linking isn't done for both debug and release builds # at the same time. notParallel.target = .NOTPARALLEL diff --git a/src/core/gn_run.pro b/src/core/gn_run.pro index e1af9e320..7d14df688 100644 --- a/src/core/gn_run.pro +++ b/src/core/gn_run.pro @@ -52,7 +52,9 @@ build_pass|!debug_and_release { else: default_target.target = first default_target.depends = runninja QMAKE_EXTRA_TARGETS += default_target -} else { +} + +!build_pass:debug_and_release { # Special GNU make target for the meta Makefile that ensures that our debug and release Makefiles won't both run ninja in parallel. notParallel.target = .NOTPARALLEL QMAKE_EXTRA_TARGETS += notParallel |