feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Squish: Fix detection of clang++ on Mac

Browse Source 
Change-Id: I02f68f7942a3774c686e1482d275e22a6037af2a
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
This commit is contained in:
Christian Stenger
2014-03-10 15:19:29 +01:00
parent 87abfc3624
commit 1b7de8c37c
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/system/suite_general/tst_default_settings/test.py
View File

@@ -163,11 +163,15 @@ def __getExpectedCompilers__():
compilers = ["g++"]
if platform.system() in ('Linux', 'Darwin'):
compilers.extend(["g++-4.0", "g++-4.2", "clang++"])
if platform.system() == 'Darwin':
xcodeClang = getOutputFromCmdline("xcrun --find clang++").strip("\n")
if xcodeClang and os.path.exists(xcodeClang) and xcodeClang not in expected:
expected.append(xcodeClang)
for compiler in compilers:
compilerPath = which(compiler)
if compilerPath:
if compiler == 'clang++':
if subprocess.call(['clang++', '-dumpmachine']) != 0:
if compiler.endswith('clang++'):
if subprocess.call([compiler, '-dumpmachine']) != 0:
test.warning("clang found in PATH, but version is not supported.")
continue
expected.append(compilerPath)