From: Ronald Oussoren <ronaldoussoren@mac.com>
Date: Sun, 11 Jul 2010 08:52:52 +0000 (+0000)
Subject: Fix for issue #9164: with this patch sysconfig and distuls don't break
X-Git-Tag: v2.7.1rc1~615
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7595620105bbdea61541fb24d8bc9dca4c9bb235;p=thirdparty%2FPython%2Fcpython.git

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 b3ec6e9606a7..4dcfeb550525 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/Lib/sysconfig.py b/Lib/sysconfig.py
index bbe331e02d32..4559cd712ae1 100644
--- a/Lib/sysconfig.py
+++ b/Lib/sysconfig.py
@@ -645,8 +645,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 86e295ef5966..6235d875682b 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -33,6 +33,8 @@ Library
 
 - Issue #9128: Fix validation of class decorators in parser module.
 
+- Issue #9164: Ensure sysconfig handles dupblice archs while building on OSX
+
 Extension Modules
 -----------------