From 2aeff89fe549088286a0fa4763f39ecf34e3eab0 Mon Sep 17 00:00:00 2001 From: Chandler Carruth Date: Mon, 7 Nov 2011 10:21:56 +0000 Subject: Merging r143807: ------------------------------------------------------------------------ r143807 | chandlerc | 2011-11-05 03:41:42 -0700 (Sat, 05 Nov 2011) | 4 lines Compute the path properly on different platforms. Specifically, compute it the exact same way that the Clang code computes this path. Hopefully with this, the MSVC bots will actually come back to life. ------------------------------------------------------------------------ git-svn-id: https://llvm.org/svn/llvm-project/cfe/branches/release_30@143936 91177308-0d34-0410-b5e6-96231b3b80d8 --- test/lit.cfg | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test/lit.cfg b/test/lit.cfg index a7430db023..35f38aa44a 100644 --- a/test/lit.cfg +++ b/test/lit.cfg @@ -147,7 +147,9 @@ if not lit.quiet: # Clang relies on the driver to locate them. # FIXME: It might be nice to teach the frontend how to find its builtin headers # in some limited cases when the driver provides no hints. -clang_builtin_includes = os.path.join(llvm_libs_dir, 'clang', '3.0', 'include') +clang_directory = os.path.dirname(os.path.realpath(config.clang)) +clang_builtin_includes = os.path.join(os.path.dirname(clang_directory), + 'lib', 'clang', '3.0', 'include') config.substitutions.append( ('%clang_cc1', '%s -cc1 -internal-nosysroot-isystem %s' % (config.clang, clang_builtin_includes)) ) -- cgit v1.2.3