diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-03-03 11:00:20 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-03-03 10:07:23 +0000 |
| commit | a0c58682ad4a9e630d15bcb5211336cfd2376442 (patch) | |
| tree | c5df3f916f03c6c8b98762820f314aa229024bfe /src/core | |
| parent | f46633806d095363fb6b75d6ce93f5f66482a72c (diff) | |
Use .NOTPARALLEL on Windows too
With Jom 1.1 supporting the special target we can use it to also avoid
compiling and linking debug and release in parallel on Windows too.
Change-Id: Ie3307f1f40fd877d04f9fea53c02fe7a37c48824
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src/core')
| -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 |