summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2018-08-19 16:15:50 +0100
committerCarl Hetherington <cth@carlh.net>2018-08-19 16:15:50 +0100
commit732739e22802c83670b2cafabbe7eff2bc75304d (patch)
tree1dbea1643c9b4c68ad99a99f529d496a0767ea42
parent4d7045f6b0a3b68619e1d5f9e10608ae2c54f919 (diff)
Fix ccache stuff.
-rwxr-xr-xcdist17
1 files changed, 11 insertions, 6 deletions
diff --git a/cdist b/cdist
index b9d81f7..265e0ca 100755
--- a/cdist
+++ b/cdist
@@ -402,7 +402,7 @@ class Target(object):
# Environment variables that we will use when we call cscripts
self.variables = {}
self.debug = False
- self.ccache = False
+ self._ccache = False
# True to build our dependencies ourselves; False if this is taken care
# of in some other way
self.build_dependencies = True
@@ -490,6 +490,13 @@ class Target(object):
def mount(self, m):
pass
+ @property
+ def ccache(self):
+ return self._ccache
+
+ @ccache.setter
+ def ccache(self, v):
+ self._ccache = v
class DockerTarget(Target):
@@ -689,16 +696,14 @@ class OSXSingleTarget(OSXTarget):
def package(self, project, checkout, output_dir, options):
raise Error('cannot package non-universal OS X versions')
- @property
- def ccache(self):
- return self.ccache
-
- @ccache.setter
+ @Target.ccache.setter
def ccache(self, v):
+ Target.ccache.fset(self, v)
if v:
self.set('CC', '"ccache gcc"')
self.set('CXX', '"ccache g++"')
+
class OSXUniversalTarget(OSXTarget):
def __init__(self, directory=None):
super(OSXUniversalTarget, self).__init__(directory)