ccache hacks.
authorCarl Hetherington <cth@carlh.net>
Thu, 16 Aug 2018 00:55:20 +0000 (01:55 +0100)
committerCarl Hetherington <cth@carlh.net>
Thu, 16 Aug 2018 00:55:20 +0000 (01:55 +0100)
cdist

diff --git a/cdist b/cdist
index c3d2c59eb1dbe760e7634897859b34a0f55f7bbf..b9d81f7f00cc30793f572ee578df4877761c3aa9 100755 (executable)
--- a/cdist
+++ b/cdist
@@ -677,9 +677,6 @@ class OSXSingleTarget(OSXTarget):
         enviro = '%s/%d' % (config.get('osx_environment_prefix'), bits)
 
         # Environment variables
-        if self.ccache:
-            self.set('CC', '"ccache gcc"')
-            self.set('CXX', '"ccache g++"')
         self.set('CFLAGS', '"-I%s/include -I%s/include %s"' % (self.directory, enviro, flags))
         self.set('CPPFLAGS', '')
         self.set('CXXFLAGS', '"-I%s/include -I%s/include %s"' % (self.directory, enviro, flags))
@@ -692,6 +689,15 @@ 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
+    def ccache(self, v):
+        if v:
+            self.set('CC', '"ccache gcc"')
+            self.set('CXX', '"ccache g++"')
 
 class OSXUniversalTarget(OSXTarget):
     def __init__(self, directory=None):