diff options
author | Steven Knight <knight@baldmt.com> | 2004-02-08 14:54:08 (GMT) |
---|---|---|
committer | Steven Knight <knight@baldmt.com> | 2004-02-08 14:54:08 (GMT) |
commit | 00b13793fe88c9d101c3a73a6809e86298ed3186 (patch) | |
tree | ddfa6fe29059052420d8203bbb6d63ba0067d7ba /src/engine/SCons/Executor.py | |
parent | 18876ab2a7399e97fa1663b64d917fbfeba57cca (diff) | |
download | SCons-00b13793fe88c9d101c3a73a6809e86298ed3186.zip SCons-00b13793fe88c9d101c3a73a6809e86298ed3186.tar.gz SCons-00b13793fe88c9d101c3a73a6809e86298ed3186.tar.bz2 |
Deprecate the overrides Builder() keyword argument in favor of specifying values directly as keyword arguments, like we do for other functions and methods.
Diffstat (limited to 'src/engine/SCons/Executor.py')
-rw-r--r-- | src/engine/SCons/Executor.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/engine/SCons/Executor.py b/src/engine/SCons/Executor.py index 797bdda..2a0882e 100644 --- a/src/engine/SCons/Executor.py +++ b/src/engine/SCons/Executor.py @@ -64,12 +64,13 @@ class Executor: # So use the environment associated with the Builder # itself. env = self.builder.env - overrides = self.builder.overrides else: # The normal case: use the Environment that was # used to specify how these targets will be built. env = self.env - overrides = self.overrides + overrides = {} + overrides.update(self.builder.overrides) + overrides.update(self.overrides) self.build_env = env.Override(overrides) return self.build_env |