From 4fd0d50a960af808fe65456ee46e13446596c48f Mon Sep 17 00:00:00 2001 From: Eric Fiselier Date: Fri, 10 Feb 2017 03:20:02 +0000 Subject: [PATCH] Attempt to fix finding clang++ on Windows git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@294699 91177308-0d34-0410-b5e6-96231b3b80d8 --- utils/libcxx/test/config.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/utils/libcxx/test/config.py b/utils/libcxx/test/config.py index fdfdc6632..72de7f49f 100644 --- 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(