Issue #13590: Improve support for OS X Xcode 4:

- fix test_distutils and test_sysconfig test failures by
  aligning sysconfig and distutils.sysconfig tailoring of
  configure variables (as in 2.7)

1 files changed, 4 insertions, 17 deletions

diff --git a/unixccompiler.py b/unixccompiler.py
index 5d45faa7..c70a3cc5 100644
--- a/unixccompiler.py
+++ b/unixccompiler.py
@@ -83,8 +83,9 @@ def _darwin_compiler_fixup(compiler_so, cc_args):
         except ValueError:
             pass
 
-    # Check if the SDK that is used during compilation actually exists.
-    # If not, revert to using the installed headers and hope for the best.
+    # Check if the SDK that is used during compilation actually exists,
+    # the universal build requires the usage of a universal SDK and not all
+    # users have that installed by default.
     sysroot = None
     if '-isysroot' in cc_args:
         idx = cc_args.index('-isysroot')
@@ -96,21 +97,7 @@ def _darwin_compiler_fixup(compiler_so, cc_args):
     if sysroot and not os.path.isdir(sysroot):
         log.warn("Compiling with an SDK that doesn't seem to exist: %s",
                 sysroot)
-        log.warn("Attempting to compile without the SDK")
-        while True:
-            try:
-                index = cc_args.index('-isysroot')
-                # Strip this argument and the next one:
-                del cc_args[index:index+2]
-            except ValueError:
-                break
-        while True:
-            try:
-                index = compiler_so.index('-isysroot')
-                # Strip this argument and the next one:
-                del compiler_so[index:index+2]
-            except ValueError:
-                break
+        log.warn("Please check your Xcode installation")
 
     return compiler_so