diff options
| author | David Fang <fang@csl.cornell.edu> | 2014-01-29 01:54:52 +0000 |
|---|---|---|
| committer | David Fang <fang@csl.cornell.edu> | 2014-01-29 01:54:52 +0000 |
| commit | a612c627400f9132f1abe5e5b790dd0466a51b2b (patch) | |
| tree | e6a4acde8c421ecd5397c21f95185846bfdc4281 /test/lit.cfg | |
| parent | 28754d0378f6ae4d82256bd80ab457b23da8c430 (diff) | |
| download | external_libcxx-a612c627400f9132f1abe5e5b790dd0466a51b2b.tar.gz external_libcxx-a612c627400f9132f1abe5e5b790dd0466a51b2b.tar.bz2 external_libcxx-a612c627400f9132f1abe5e5b790dd0466a51b2b.zip | |
lit.site.cfg:cxx_under_test should take precedence over 'which clang++'
(reviewed by Marshall Clow)
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@200364 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test/lit.cfg')
| -rw-r--r-- | test/lit.cfg | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/test/lit.cfg b/test/lit.cfg index aa4543974..5e64e54de 100644 --- a/test/lit.cfg +++ b/test/lit.cfg @@ -181,10 +181,11 @@ if cxx_under_test is None: cxx_under_test = getattr(config, 'cxx_under_test', None) # If no specific cxx_under_test was given, attempt to infer it as clang++. - clangxx = lit.util.which('clang++', config.environment['PATH']) - if clangxx is not None: - cxx_under_test = clangxx - lit_config.note("inferred cxx_under_test as: %r" % (cxx_under_test,)) + if cxx_under_test is None: + clangxx = lit.util.which('clang++', config.environment['PATH']) + if clangxx is not None: + cxx_under_test = clangxx + lit_config.note("inferred cxx_under_test as: %r" % (cxx_under_test,)) if cxx_under_test is None: lit_config.fatal('must specify user parameter cxx_under_test ' '(e.g., --param=cxx_under_test=clang++)') |