diff options
| author | William Deegan <bill@baddogconsulting.com> | 2022-10-12 22:45:52 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-12 22:45:52 (GMT) |
| commit | b23bbee1bfcffab6c22f6d32689a16c093a983d3 (patch) | |
| tree | e55e82b2d0699adfbdcab61cb1d527bca2a66f4f /SCons/Script/Main.py | |
| parent | c12f46fd9ec3fc25f11e1e9d680aace77e521c78 (diff) | |
| parent | 1f82d0e7f690617c56ec8484a45e191a059e61ef (diff) | |
| download | SCons-b23bbee1bfcffab6c22f6d32689a16c093a983d3.zip SCons-b23bbee1bfcffab6c22f6d32689a16c093a983d3.tar.gz SCons-b23bbee1bfcffab6c22f6d32689a16c093a983d3.tar.bz2 | |
Merge pull request #4242 from SCons/move_taskmaster_to_package
Move Taskmaster to package
Diffstat (limited to 'SCons/Script/Main.py')
| -rw-r--r-- | SCons/Script/Main.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/SCons/Script/Main.py b/SCons/Script/Main.py index 1b06a64..22042f5 100644 --- a/SCons/Script/Main.py +++ b/SCons/Script/Main.py @@ -52,7 +52,7 @@ import SCons.Debug import SCons.Defaults import SCons.Environment import SCons.Errors -import SCons.Job +import SCons.Taskmaster.Job import SCons.Node import SCons.Node.FS import SCons.Platform @@ -1134,7 +1134,7 @@ def _main(parser): SCons.Node.FS.set_duplicate(options.duplicate) fs.set_max_drift(options.max_drift) - SCons.Job.explicit_stack_size = options.stack_size + SCons.Taskmaster.Job.explicit_stack_size = options.stack_size # Hash format and chunksize are set late to support SetOption being called # in a SConscript or SConstruct file. @@ -1321,7 +1321,7 @@ def _build_targets(fs, options, targets, target_top): # to check if python configured with threads. global num_jobs num_jobs = options.num_jobs - jobs = SCons.Job.Jobs(num_jobs, taskmaster) + jobs = SCons.Taskmaster.Job.Jobs(num_jobs, taskmaster) if num_jobs > 1: msg = None if jobs.num_jobs == 1 or not python_has_threads: |