diff options
| author | William Deegan <bill@baddogconsulting.com> | 2016-05-23 23:21:26 (GMT) |
|---|---|---|
| committer | William Deegan <bill@baddogconsulting.com> | 2016-05-23 23:21:26 (GMT) |
| commit | aa5a0468340338cc3423a06d6d55e1b52a713bc5 (patch) | |
| tree | 71ff4e88b1e418ff32ba89ae0f4cf0b3f0d180a1 /src/engine/SCons/Executor.py | |
| parent | 15bd909b178ba5271125fca6846fa8c069be79f1 (diff) | |
| parent | b387e34357c968d0855c525c7e838657a957ff01 (diff) | |
| download | SCons-aa5a0468340338cc3423a06d6d55e1b52a713bc5.zip SCons-aa5a0468340338cc3423a06d6d55e1b52a713bc5.tar.gz SCons-aa5a0468340338cc3423a06d6d55e1b52a713bc5.tar.bz2 | |
merge python3 branch to default
Diffstat (limited to 'src/engine/SCons/Executor.py')
| -rw-r--r-- | src/engine/SCons/Executor.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/engine/SCons/Executor.py b/src/engine/SCons/Executor.py index b6d4cb6..7107fde 100644 --- a/src/engine/SCons/Executor.py +++ b/src/engine/SCons/Executor.py @@ -455,9 +455,9 @@ class Executor(object): except KeyError: pass env = self.get_build_env() - result = "".join([action.get_contents(self.get_all_targets(), - self.get_all_sources(), - env) + result = b"".join([action.get_contents(self.get_all_targets(), + self.get_all_sources(), + env) for action in self.get_action_list()]) self._memo['get_contents'] = result return result |