Issue #21311: Avoid exception in _osx_support with non-standard compiler

configurations.  Patch by John Szakmeister.
This commit is contained in:
Ned Deily 2014-04-19 13:25:29 -07:00
parent 3d050ddf19
commit f31b478208
3 changed files with 5 additions and 1 deletions

View file

@ -182,7 +182,7 @@ def _find_appropriate_compiler(_config_vars):
# Compiler is GCC, check if it is LLVM-GCC # Compiler is GCC, check if it is LLVM-GCC
data = _read_output("'%s' --version" data = _read_output("'%s' --version"
% (cc.replace("'", "'\"'\"'"),)) % (cc.replace("'", "'\"'\"'"),))
if 'llvm-gcc' in data: if data and 'llvm-gcc' in data:
# Found LLVM-GCC, fall back to clang # Found LLVM-GCC, fall back to clang
cc = _find_build_tool('clang') cc = _find_build_tool('clang')

View file

@ -1281,6 +1281,7 @@ Andrew Svetlov
Paul Swartz Paul Swartz
Thenault Sylvain Thenault Sylvain
Péter Szabó Péter Szabó
John Szakmeister
Amir Szekely Amir Szekely
Arfrever Frehtes Taifersar Arahesis Arfrever Frehtes Taifersar Arahesis
Hideaki Takahashi Hideaki Takahashi

View file

@ -165,6 +165,9 @@ Library
- asyncio: Add gi_{frame,running,code} properties to CoroWrapper - asyncio: Add gi_{frame,running,code} properties to CoroWrapper
(upstream issue #163). (upstream issue #163).
- Issue #21311: Avoid exception in _osx_support with non-standard compiler
configurations. Patch by John Szakmeister.
Extension Modules Extension Modules
----------------- -----------------