summaryrefslogtreecommitdiffstats
path: root/src/engine/SCons/Job.py
diff options
context:
space:
mode:
authorSteven Knight <knight@baldmt.com>2008-09-13 04:48:36 (GMT)
committerSteven Knight <knight@baldmt.com>2008-09-13 04:48:36 (GMT)
commit308079e3a60d8fc7e038ea264f4f60e085f99b23 (patch)
tree345578c37927a7f0313a66b4c385b7a7e2a76b2a /src/engine/SCons/Job.py
parent0ae58f3c365a85c538461cfcf92ff353d675ed0b (diff)
downloadSCons-308079e3a60d8fc7e038ea264f4f60e085f99b23.zip
SCons-308079e3a60d8fc7e038ea264f4f60e085f99b23.tar.gz
SCons-308079e3a60d8fc7e038ea264f4f60e085f99b23.tar.bz2
Additional clean up of how we import some SCons.* module names, including
making SCons.Job.stack_size a variable that always exists, instead of one that gets set from outside and requires SCons.Job to check for an AttributeError.
Diffstat (limited to 'src/engine/SCons/Job.py')
-rw-r--r--src/engine/SCons/Job.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/engine/SCons/Job.py b/src/engine/SCons/Job.py
index e6d02e4..86886e0 100644
--- a/src/engine/SCons/Job.py
+++ b/src/engine/SCons/Job.py
@@ -34,7 +34,7 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
import os
import signal
-import SCons
+import SCons.Errors
# The default stack size (in kilobytes) of the threads used to execute
# jobs in parallel.
@@ -44,6 +44,7 @@ import SCons
# parallelized the build. For example, the default stack size on linux
# is 8 MBytes.
+explicit_stack_size = None
default_stack_size = 256
interrupt_msg = 'Build interrupted.'
@@ -81,9 +82,8 @@ class Jobs:
self.job = None
if num > 1:
- try:
- stack_size = SCons.Job.stack_size
- except AttributeError:
+ stack_size = explicit_stack_size
+ if stack_size is None:
stack_size = default_stack_size
try: