]> granicus.if.org Git - python/commitdiff
Issue #21311: Avoid exception in _osx_support with non-standard compiler
authorNed Deily <nad@acm.org>
Sat, 19 Apr 2014 20:25:29 +0000 (13:25 -0700)
committerNed Deily <nad@acm.org>
Sat, 19 Apr 2014 20:25:29 +0000 (13:25 -0700)
configurations.  Patch by John Szakmeister.

Lib/_osx_support.py
Misc/ACKS
Misc/NEWS

index 40fc78b6984bda926434f681e21b29aa7fcdee42..b6eac5f66753ba400ebcb64113448a478601734d 100644 (file)
@@ -182,7 +182,7 @@ def _find_appropriate_compiler(_config_vars):
         # 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')
 
index 40f7cbefb224819c5b0887c7e0ebd42f26610434..65d1adbe05694c192c3fb9f8622f75a3e0dfea3b 100644 (file)
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1281,6 +1281,7 @@ Andrew Svetlov
 Paul Swartz
 Thenault Sylvain
 Péter Szabó
+John Szakmeister
 Amir Szekely
 Arfrever Frehtes Taifersar Arahesis
 Hideaki Takahashi
index 3e121afc2bd70bd2423ba2866e70b1be03091d10..1b5ac6c497f8d3aa02321b576ba0112fe536d88d 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -165,6 +165,9 @@ Library
 - 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
 -----------------