diff options
| -rwxr-xr-x | morph | 1 | ||||
| -rw-r--r-- | morphlib/builder.py | 3 |
2 files changed, 3 insertions, 1 deletions
@@ -40,6 +40,7 @@ class Morph(cliapp.Application): 'put build results in DIR (default: %default)', metavar='DIR', default='.') self.settings.boolean(['no-ccache'], 'do not use ccache') + self.settings.boolean(['no-distcc'], 'do not use distcc') self.settings.integer(['max-jobs'], 'run at most N parallel jobs with make (default ' 'is to a value based on the number of CPUs ' diff --git a/morphlib/builder.py b/morphlib/builder.py index b1ce70b3..f59b255a 100644 --- a/morphlib/builder.py +++ b/morphlib/builder.py @@ -197,7 +197,8 @@ class Chunk(BinaryBlob): self.ex.env['PATH'] = ('/usr/lib/ccache:%s' % self.ex.env['PATH']) self.ex.env['CCACHE_BASEDIR'] = self.tempdir.dirname - self.ex.env['CCACHE_PREFIX'] = 'distcc' + if not self.settings['no-distcc']: + self.ex.env['CCACHE_PREFIX'] = 'distcc' logging.debug('Environment for building chunk:') for key in sorted(self.ex.env): |