From: Ronald Oussoren <ronaldoussoren@mac.com>
Date: Tue, 15 Sep 2009 18:33:33 +0000 (+0000)
Subject: MacOSX: detect the architectures supported by
X-Git-Tag: v2.7a1~542
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=91a11a46c0dfc01702bbd315fbb424aef2ccd45c;p=python

MacOSX: detect the architectures supported by
Tk.framework and build _tkinter only for those
architectures.

This replaces the hardcoded solution that is no
longer valid now that 64-bit capable versions of
Tk are available on OSX.
---

diff --git a/setup.py b/setup.py
index 421271edca..e12869721d 100644
--- a/setup.py
+++ b/setup.py
@@ -1499,19 +1499,17 @@ class PyBuildExt(build_ext):
         # architectures.
         cflags = sysconfig.get_config_vars('CFLAGS')[0]
         archs = re.findall('-arch\s+(\w+)', cflags)
-        if 'x86_64' in archs or 'ppc64' in archs:
-            try:
-                archs.remove('x86_64')
-            except ValueError:
-                pass
-            try:
-                archs.remove('ppc64')
-            except ValueError:
-                pass
-
-            for a in archs:
-                frameworks.append('-arch')
-                frameworks.append(a)
+        fp = os.popen("file %s/Tk.framework/Tk | grep 'for architecture'"%(F,))
+        detected_archs = []
+        for ln in fp:
+            a = ln.split()[-1]
+            if a in archs:
+                detected_archs.append(ln.split()[-1])
+        fp.close()
+
+        for a in detected_archs:
+            frameworks.append('-arch')
+            frameworks.append(a)
 
         ext = Extension('_tkinter', ['_tkinter.c', 'tkappinit.c'],
                         define_macros=[('WITH_APPINIT', 1)],