diff options
| author | Ronald Oussoren <ronaldoussoren@mac.com> | 2008-12-28 19:50:40 (GMT) |
|---|---|---|
| committer | Ronald Oussoren <ronaldoussoren@mac.com> | 2008-12-28 19:50:40 (GMT) |
| commit | 88a3083c28c9572bfa145f40e21d9c86e9fade04 (patch) | |
| tree | dfae3a25875ca284bb58b44d60038ee0b236f792 /Lib | |
| parent | 4b48c612bbc2422ad89aea3db6e7fa286b6fd2d5 (diff) | |
| download | cpython-88a3083c28c9572bfa145f40e21d9c86e9fade04.zip cpython-88a3083c28c9572bfa145f40e21d9c86e9fade04.tar.gz cpython-88a3083c28c9572bfa145f40e21d9c86e9fade04.tar.bz2 | |
Update the fix for issue4064 to deal correctly with all three variants of
universal builds that are presented by the configure script.
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/distutils/util.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Lib/distutils/util.py b/Lib/distutils/util.py index 48cc17f..e9d29ff 100644 --- a/Lib/distutils/util.py +++ b/Lib/distutils/util.py @@ -140,9 +140,13 @@ def get_platform (): # 'universal' instead of 'fat'. machine = 'fat' + cflags = get_config_vars().get('CFLAGS') - if '-arch x86_64' in get_config_vars().get('CFLAGS'): - machine = 'universal' + if '-arch x86_64' in cflags: + if '-arch i386' in cflags: + machine = 'universal' + else: + machine = 'fat64' elif machine in ('PowerPC', 'Power_Macintosh'): # Pick a sane name for the PPC architecture. |