Merge pull request #3109 from bdbaddog/pypy_enable_threading

Reenable parallel builds with Pypy
SCons · Mar 25, 2018 · 20927b4 · 20927b4
2 parents e7b15e2 + 3ddce3f
commit 20927b4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -48,6 +48,7 @@
 import time
 import traceback
 import sysconfig
+import platform
 
 import SCons.CacheDir
 import SCons.Debug
@@ -1253,7 +1254,8 @@ def order(dependencies):
     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