diff options
| author | William Deegan <bill@baddogconsulting.com> | 2017-04-07 16:26:08 (GMT) |
|---|---|---|
| committer | William Deegan <bill@baddogconsulting.com> | 2017-04-07 16:26:08 (GMT) |
| commit | 5b713da0b1c7b56b8eeff30f26e87f72dda8c901 (patch) | |
| tree | 40935ca24d3eca26cb861bdb1a476c59bbcf8627 | |
| parent | 16891265ea2e81e03b8bb3d6e30bbc2a2a642ebe (diff) | |
| parent | 8e6b5fc8645b39234367d95590fabf91329c248f (diff) | |
| download | SCons-5b713da0b1c7b56b8eeff30f26e87f72dda8c901.zip SCons-5b713da0b1c7b56b8eeff30f26e87f72dda8c901.tar.gz SCons-5b713da0b1c7b56b8eeff30f26e87f72dda8c901.tar.bz2 | |
Merged in bdbaddog/scons (pull request #441)
fix breaking windows check for functional parallel builds
| -rw-r--r-- | src/engine/SCons/Script/Main.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/engine/SCons/Script/Main.py b/src/engine/SCons/Script/Main.py index b7ce466..c810634 100644 --- a/src/engine/SCons/Script/Main.py +++ b/src/engine/SCons/Script/Main.py @@ -1260,11 +1260,11 @@ def _build_targets(fs, options, targets, target_top): jobs = SCons.Job.Jobs(num_jobs, taskmaster) if num_jobs > 1: msg = None - if jobs.num_jobs == 1 or not python_has_threads: + if sys.platform == 'win32': + msg = fetch_win32_parallel_msg() + elif jobs.num_jobs == 1 or not python_has_threads: msg = "parallel builds are unsupported by this version of Python;\n" + \ "\tignoring -j or num_jobs option.\n" - elif sys.platform == 'win32': - msg = fetch_win32_parallel_msg() if msg: SCons.Warnings.warn(SCons.Warnings.NoParallelSupportWarning, msg) |