From 3ddce3f72dec6d9e4cc0381a1c00164264bef39d Mon Sep 17 00:00:00 2001 From: William Deegan Date: Sat, 24 Mar 2018 20:16:14 -0400 Subject: Reenable parallel builds with Pypy --- src/CHANGES.txt | 1 + src/engine/SCons/Script/Main.py | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/CHANGES.txt b/src/CHANGES.txt index 954af11..64c0893 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -25,6 +25,7 @@ RELEASE 3.1.0.alpha.yyyymmdd - NEW DATE WILL BE INSERTED HERE From William Deegan: - Remove long deprecated SCons.Options code and tests. This removes BoolOption,EnumOption, ListOption,PackageOption, and PathOption which have been replaced by *Variable() many years ago. + - Re-Enable parallel SCons (-j) when running via Pypy From Andrew Featherstone - Removed unused --warn options from the man page and source code. diff --git a/src/engine/SCons/Script/Main.py b/src/engine/SCons/Script/Main.py index c810634..f111d35 100644 --- a/src/engine/SCons/Script/Main.py +++ b/src/engine/SCons/Script/Main.py @@ -48,6 +48,7 @@ import sys import time import traceback import sysconfig +import platform import SCons.CacheDir import SCons.Debug @@ -1253,7 +1254,8 @@ def _build_targets(fs, options, targets, target_top): BuildTask.options = options - python_has_threads = sysconfig.get_config_var('WITH_THREAD') + is_pypy = platform.python_implementation() == 'PyPy' + python_has_threads = sysconfig.get_config_var('WITH_THREAD') or is_pypy # to check if python configured with threads. global num_jobs num_jobs = options.num_jobs -- cgit v0.12