Fix OS X build again.
authorCarl Hetherington <cth@carlh.net>
Thu, 20 Jun 2013 07:40:52 +0000 (08:40 +0100)
committerCarl Hetherington <cth@carlh.net>
Thu, 20 Jun 2013 07:40:52 +0000 (08:40 +0100)
cdist

diff --git a/cdist b/cdist
index 4eee38973096eb1099fed635ecf592746163320b..c7864f837083b0fe61e96d3b66cca031a79cd642 100755 (executable)
--- a/cdist
+++ b/cdist
@@ -356,20 +356,13 @@ class OSXUniversalTarget(OSXTarget):
         self.parts.append(OSXSingleTarget(32))
         self.parts.append(OSXSingleTarget(64))
 
-    def work_dir_cdist(self):
-        return '%s/universal' % self.host_mount_dir
-
-    def work_dir_cscript(self):
-        return '%s/universal' % OSX_DIR_IN_HOST
-
     def package(self, project):
         for p in self.parts:
             project.checkout(p)
             p.build_dependencies(project)
             p.build(project)
 
-        project.checkout(self)
-        return project.cscript['package'](self, project.version)
+        return project.cscript['package'](self.parts[-1], project.version)
     
 
 #