changeset:   90416:2a4401109672
parent:      90413:cbe7b5a5a110
parent:      90415:3d1578c705c9
user:        Ned Deily <nad@acm.org>
date:        Sat Apr 19 13:27:06 2014 -0700
files:       Misc/ACKS Misc/NEWS
description:
Issue #21311: merge with 3.4


diff -r cbe7b5a5a110 -r 2a4401109672 Lib/_osx_support.py
--- a/Lib/_osx_support.py	Sat Apr 19 21:07:16 2014 +0200
+++ b/Lib/_osx_support.py	Sat Apr 19 13:27:06 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 cbe7b5a5a110 -r 2a4401109672 Misc/ACKS
--- a/Misc/ACKS	Sat Apr 19 21:07:16 2014 +0200
+++ b/Misc/ACKS	Sat Apr 19 13:27:06 2014 -0700
@@ -1283,6 +1283,7 @@
 Paul Swartz
 Thenault Sylvain
 Péter Szabó
+John Szakmeister
 Amir Szekely
 Arfrever Frehtes Taifersar Arahesis
 Hideaki Takahashi
diff -r cbe7b5a5a110 -r 2a4401109672 Misc/NEWS
--- a/Misc/NEWS	Sat Apr 19 21:07:16 2014 +0200
+++ b/Misc/NEWS	Sat Apr 19 13:27:06 2014 -0700
@@ -244,6 +244,9 @@
 - asyncio: Add gi_{frame,running,code} properties to CoroWrapper
   (upstream issue #163).
 
+- Issue #21311: Avoid exception in _osx_support with non-standard compiler
+  configurations.  Patch by John Szakmeister.
+
 Extension Modules
 -----------------