Commit 84889012 authored by Ned Deily's avatar Ned Deily

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

configurations.  Patch by John Szakmeister.
parent f27ec3e5
...@@ -182,7 +182,7 @@ def _find_appropriate_compiler(_config_vars): ...@@ -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')
......
...@@ -1280,6 +1280,7 @@ Andrew Svetlov ...@@ -1280,6 +1280,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
......
...@@ -271,6 +271,9 @@ Library ...@@ -271,6 +271,9 @@ Library
(Original patches by Hirokazu Yamamoto and Amaury Forgeot d'Arc, with (Original patches by Hirokazu Yamamoto and Amaury Forgeot d'Arc, with
suggested wording by David Gutteridge) suggested wording by David Gutteridge)
- Issue #21311: Avoid exception in _osx_support with non-standard compiler
configurations. Patch by John Szakmeister.
Tools/Demos Tools/Demos
----------- -----------
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment