Author: ericwf Date: Thu Feb 9 21:20:02 2017 New Revision: 294699 URL: http://llvm.org/viewvc/llvm-project?rev=294699&view=rev Log: Attempt to fix finding clang++ on Windows
Modified: libcxx/trunk/utils/libcxx/test/config.py Modified: libcxx/trunk/utils/libcxx/test/config.py URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/utils/libcxx/test/config.py?rev=294699&r1=294698&r2=294699&view=diff ============================================================================== --- libcxx/trunk/utils/libcxx/test/config.py (original) +++ libcxx/trunk/utils/libcxx/test/config.py Thu Feb 9 21:20:02 2017 @@ -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( _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits