changeset:   90414:e3217efa6edd
branch:      2.7
parent:      90386:1bc0a8310b9f
user:        Ned Deily <nad@acm.org>
date:        Sat Apr 19 13:24:03 2014 -0700
files:       Lib/_osx_support.py Misc/ACKS Misc/NEWS
description:
Issue #21311: Avoid exception in _osx_support with non-standard compiler
configurations.  Patch by John Szakmeister.


diff -r 1bc0a8310b9f -r e3217efa6edd Lib/_osx_support.py
--- a/Lib/_osx_support.py	Thu Apr 17 20:11:19 2014 +0200
+++ b/Lib/_osx_support.py	Sat Apr 19 13:24:03 2014 -0700
@@ -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 -r 1bc0a8310b9f -r e3217efa6edd Misc/ACKS
--- a/Misc/ACKS	Thu Apr 17 20:11:19 2014 +0200
+++ b/Misc/ACKS	Sat Apr 19 13:24:03 2014 -0700
@@ -1280,6 +1280,7 @@
 Paul Swartz
 Thenault Sylvain
 Péter Szabó
+John Szakmeister
 Amir Szekely
 Arfrever Frehtes Taifersar Arahesis
 Hideaki Takahashi
diff -r 1bc0a8310b9f -r e3217efa6edd Misc/NEWS
--- a/Misc/NEWS	Thu Apr 17 20:11:19 2014 +0200
+++ b/Misc/NEWS	Sat Apr 19 13:24:03 2014 -0700
@@ -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
 -----------