[libcxx] r200364 - lit.site.cfg:cxx_under_test should take precedence over 'which clang++'

[David Fang]

Author: fangism
Date: Tue Jan 28 19:54:52 2014
New Revision: 200364

URL: http://llvm.org/viewvc/llvm-project?rev=200364&view=rev
Log:
lit.site.cfg:cxx_under_test should take precedence over 'which clang++'
(reviewed by Marshall Clow)

Modified:
    libcxx/trunk/test/lit.cfg

Modified: libcxx/trunk/test/lit.cfg
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/lit.cfg?rev=200364&r1=200363&r2=200364&view=diff
==============================================================================
--- libcxx/trunk/test/lit.cfg (original)
+++ libcxx/trunk/test/lit.cfg Tue Jan 28 19:54:52 2014
@@ -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++)')