[pypy-svn] r79853 - in pypy/branch/fast-forward/lib-python/modified-2.7.0: . distutils

[afa at codespeak.net]

Author: afa
Date: Mon Dec  6 17:28:23 2010
New Revision: 79853

Modified:
   pypy/branch/fast-forward/lib-python/modified-2.7.0/   (props changed)
   pypy/branch/fast-forward/lib-python/modified-2.7.0/distutils/unixccompiler.py
Log:
Merge 2.5.2 changes into 2.7.0


Modified: pypy/branch/fast-forward/lib-python/modified-2.7.0/distutils/unixccompiler.py
==============================================================================
--- pypy/branch/fast-forward/lib-python/modified-2.7.0/distutils/unixccompiler.py	(original)
+++ pypy/branch/fast-forward/lib-python/modified-2.7.0/distutils/unixccompiler.py	Mon Dec  6 17:28:23 2010
@@ -125,7 +125,22 @@
                   }
 
     if sys.platform[:6] == "darwin":
+        import platform
+        if platform.machine() == 'i386':
+            if platform.architecture()[0] == '32bit':
+                arch = 'i386'
+            else:
+                arch = 'x86_64'
+        else:
+            # just a guess
+            arch = platform.machine()
         executables['ranlib'] = ["ranlib"]
+        executables['linker_so'] += ['-undefined', 'dynamic_lookup']
+
+        for k, v in executables.iteritems():
+            if v and v[0] == 'cc':
+                v += ['-arch', arch]
+
 
     # Needed for the filename generation methods provided by the base
     # class, CCompiler.  NB. whoever instantiates/uses a particular