From: Ned Deily <nad@acm.org>
Date: Sat, 19 Apr 2014 20:24:03 +0000 (-0700)
Subject: Issue #21311: Avoid exception in _osx_support with non-standard compiler
X-Git-Tag: v2.7.7rc1~49
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=84889012820d5bfa02d77898a433e214b22b187a;p=python

Issue #21311: Avoid exception in _osx_support with non-standard compiler
configurations.  Patch by John Szakmeister.
---

diff --git a/Lib/_osx_support.py b/Lib/_osx_support.py
index 5a0b71e9ca..d02b8856af 100644
--- a/Lib/_osx_support.py
+++ b/Lib/_osx_support.py
@@ -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')
 
diff --git a/Misc/ACKS b/Misc/ACKS
index 3af3ff401d..9a6f57adbd 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1280,6 +1280,7 @@ Andrew Svetlov
 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
index 4c0c3a67fa..54546b444e 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -271,6 +271,9 @@ Library
   (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
 -----------