maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

lit.site.cfg:cxx_under_test should take precedence over 'which clang++' 

(reviewed by Marshall Clow)

llvm-svn: 200364
This commit is contained in:
David Fang 2014-01-29 01:54:52 +00:00
parent cfdd8b54cf
commit 7584238232
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libcxx/test/lit.cfg
View File

@ -181,10 +181,11 @@ if cxx_under_test is None:
cxx_under_test = getattr(config, 'cxx_under_test', None) cxx_under_test = getattr(config, 'cxx_under_test', None)
# If no specific cxx_under_test was given, attempt to infer it as clang++. # If no specific cxx_under_test was given, attempt to infer it as clang++.
clangxx = lit.util.which('clang++', config.environment['PATH']) if cxx_under_test is None:
if clangxx is not None: clangxx = lit.util.which('clang++', config.environment['PATH'])
cxx_under_test = clangxx if clangxx is not None:
lit_config.note("inferred cxx_under_test as: %r" % (cxx_under_test,)) cxx_under_test = clangxx
lit_config.note("inferred cxx_under_test as: %r" % (cxx_under_test,))
if cxx_under_test is None: if cxx_under_test is None:
lit_config.fatal('must specify user parameter cxx_under_test ' lit_config.fatal('must specify user parameter cxx_under_test '
'(e.g., --param=cxx_under_test=clang++)') '(e.g., --param=cxx_under_test=clang++)')