diff options
| author | Gary Oberbrunner <garyo@darkstarsystems.com> | 2018-07-12 12:03:48 (GMT) |
|---|---|---|
| committer | Gary Oberbrunner <garyo@darkstarsystems.com> | 2018-07-13 19:55:22 (GMT) |
| commit | a29fca804cc209bc70c9aaddb0f51d5e81a5cac0 (patch) | |
| tree | 2d82e3bd01cdb6cd2322cf726e3c687859180c97 /src/engine/SCons/Script | |
| parent | e00b7ef1f2f3f4bbc372d8b41c9d58c19a159d28 (diff) | |
| download | SCons-a29fca804cc209bc70c9aaddb0f51d5e81a5cac0.zip SCons-a29fca804cc209bc70c9aaddb0f51d5e81a5cac0.tar.gz SCons-a29fca804cc209bc70c9aaddb0f51d5e81a5cac0.tar.bz2 | |
Fix -jN for Python3.7, which always has thread support
Diffstat (limited to 'src/engine/SCons/Script')
| -rw-r--r-- | src/engine/SCons/Script/Main.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/engine/SCons/Script/Main.py b/src/engine/SCons/Script/Main.py index 923ef1e..1d3fb54 100644 --- a/src/engine/SCons/Script/Main.py +++ b/src/engine/SCons/Script/Main.py @@ -1255,7 +1255,11 @@ def _build_targets(fs, options, targets, target_top): is_pypy = platform.python_implementation() == 'PyPy' - python_has_threads = sysconfig.get_config_var('WITH_THREAD') or is_pypy + # As of 3.7, python removed support for threadless platforms. + # See https://www.python.org/dev/peps/pep-0011/ + is_37_or_later = sys.version_info.major > 3 or \ + sys.version_info.major == 3 and sys.version_info.minor >= 7 + python_has_threads = sysconfig.get_config_var('WITH_THREAD') or is_pypy or is_37_or_later # to check if python configured with threads. global num_jobs num_jobs = options.num_jobs |