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 36ac72138658827fd6b31a8a1852ff9bd472fbb4..c4a8711d0881fcd7b392024a93ec8cd142cff3ab 100644 (file)
--- 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 f6f8044ac8098da63915847b14f276fb1007b545..fdd9a42d1253f0cb11136b6fee3110ac37589cf5 100644 (file)
--- 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'