[cig-commits] r17018 - cs/buildbot/trunk/buildbot/scripts

[walter at geodynamics.org]

Author: walter
Date: 2010-06-22 11:29:10 -0700 (Tue, 22 Jun 2010)
New Revision: 17018

Modified:
   cs/buildbot/trunk/buildbot/scripts/packager.py
Log:
Fixes for mac

Modified: cs/buildbot/trunk/buildbot/scripts/packager.py
===================================================================
--- cs/buildbot/trunk/buildbot/scripts/packager.py	2010-06-22 18:25:34 UTC (rev 17017)
+++ cs/buildbot/trunk/buildbot/scripts/packager.py	2010-06-22 18:29:10 UTC (rev 17018)
@@ -45,6 +45,8 @@
             libraries.extend(["stdc++", "gcc_s", "g2c",
                               "gfortran", "f77blas", "cblas", "atlas" # x86_64
                               ])
+        if opSys == "darwin":
+            libraries.extend(["stdc++", "gcc_s", "gfortran"])
         for l in libraries:
             if l == "mpi":
                 l = "*mpich"
@@ -670,7 +672,10 @@
     opSys = platform.system().lower()
     if opSys.startswith("cygwin"):
         opSys = "win"
-    arch = opSys + "-" + (platform.processor() or platform.machine()) # Why does every last detail have to be painful?
+    if opSys=="darwin":
+        arch = opSys + "-" + (platform.mac_ver()[0] or '10.4')
+    else:
+        arch = opSys + "-" + (platform.processor() or platform.machine()) # Why does every last detail have to be painful?
     tag = "%s-b%04d" % (revision, buildnumber)
     python = os.environ['PYTHON']
     prefix = os.environ['PREFIX']