Attempt to fix finding clang++ on Windows

git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@294699 91177308-0d34-0410-b5e6-96231b3b80d8
2017-02-10 03:20:02 +00:00
parent 29e1142d8b
commit 4fd0d50a96
1 changed files with 4 additions and 2 deletions
--- a/utils/libcxx/test/config.py
+++ b/utils/libcxx/test/config.py
@@ -198,8 +198,10 @@ class Configuration(object):
        # If no specific cxx_under_test was given, attempt to infer it as
        # clang++.
        if cxx is None or self.cxx_is_clang_cl:
-            clangxx = libcxx.util.which('clang++',
-                                     self.config.environment['PATH'])
+            search_paths = self.config.environment['PATH']
+            if cxx is not None and os.path.isabs(cxx):
+                search_paths = os.path.dirname(cxx)
+            clangxx = libcxx.util.which('clang++', search_paths)
            if clangxx:
                cxx = clangxx
                self.lit_config.note(