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

ned.deily python-checkins at python.org
Sat Apr 19 22:27:48 CEST 2014


http://hg.python.org/cpython/rev/3d1578c705c9
changeset:   90415:3d1578c705c9
branch:      3.4
parent:      90411:16207b8495bf
user:        Ned Deily <nad at acm.org>
date:        Sat Apr 19 13:25:29 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
@@ -1281,6 +1281,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
@@ -165,6 +165,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
 -----------------
 

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


More information about the Python-checkins mailing list