From: Ronald Oussoren <ronaldoussoren@mac.com>
Date: Sun, 11 Jul 2010 09:08:11 +0000 (+0000)
Subject: Merged revisions 82791 via svnmerge from
X-Git-Tag: v2.6.6rc1~128
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a729721628a2e0e311d5fdf646e141759f88a7b6;p=python

Merged revisions 82791 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/release27-maint

........
  r82791 | ronald.oussoren | 2010-07-11 10:52:52 +0200 (Sun, 11 Jul 2010) | 4 lines

  Fix for issue #9164: with this patch sysconfig and distuls don't break
  when duplicate '-arch foo' flags end up in CFLAGS (which may happen when
  building a universal build using macports)
........
---

diff --git a/Lib/distutils/util.py b/Lib/distutils/util.py
index 36ac721386..c4a8711d08 100644
--- a/Lib/distutils/util.py
+++ b/Lib/distutils/util.py
@@ -144,8 +144,7 @@ def get_platform ():
                 cflags = get_config_vars().get('CFLAGS')
 
                 archs = re.findall('-arch\s+(\S+)', cflags)
-                archs.sort()
-                archs = tuple(archs)
+                archs = tuple(sorted(set(archs)))
 
                 if len(archs) == 1:
                     machine = archs[0]
diff --git a/Misc/NEWS b/Misc/NEWS
index f6f8044ac8..fdd9a42d12 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -81,6 +81,8 @@ C-API
 Library
 -------
 
+- Issue #9164: Ensure sysconfig handles dupblice archs while building on OSX
+
 - Issue #7646: The fnmatch pattern cache no longer grows without bound.
 
 - Issue #9136: Fix 'dictionary changed size during iteration'