[Python-checkins] cpython (2.7): Issue #21311: Avoid exception in _osx_support with non-standard compiler

[ned.deily]

http://hg.python.org/cpython/rev/e3217efa6edd
changeset:   90414:e3217efa6edd
branch:      2.7
parent:      90386:1bc0a8310b9f
user:        Ned Deily <nad at acm.org>
date:        Sat Apr 19 13:24:03 2014 -0700
summary:
  Issue #21311: Avoid exception in _osx_support with non-standard compiler
configurations.  Patch by John Szakmeister.

files:
  Lib/_osx_support.py |  2 +-
  Misc/ACKS           |  1 +
  Misc/NEWS           |  3 +++
  3 files changed, 5 insertions(+), 1 deletions(-)


diff --git a/Lib/_osx_support.py b/Lib/_osx_support.py
--- a/Lib/_osx_support.py
+++ b/Lib/_osx_support.py
@@ -182,7 +182,7 @@
         # Compiler is GCC, check if it is LLVM-GCC
         data = _read_output("'%s' --version"
                              % (cc.replace("'", "'\"'\"'"),))
-        if 'llvm-gcc' in data:
+        if data and 'llvm-gcc' in data:
             # Found LLVM-GCC, fall back to clang
             cc = _find_build_tool('clang')
 
diff --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1280,6 +1280,7 @@
 Paul Swartz
 Thenault Sylvain
 Péter Szabó
+John Szakmeister
 Amir Szekely
 Arfrever Frehtes Taifersar Arahesis
 Hideaki Takahashi
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -271,6 +271,9 @@
   (Original patches by Hirokazu Yamamoto and Amaury Forgeot d'Arc, with
   suggested wording by David Gutteridge)
 
+- Issue #21311: Avoid exception in _osx_support with non-standard compiler
+  configurations.  Patch by John Szakmeister.
+
 Tools/Demos
 -----------
 

-- 
Repository URL: http://hg.python.org/cpython