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/trunk@143807 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/test/lit.cfg b/test/lit.cfg
index a7430db023381f4c6e2297d87cd66f090533aff7..35f38aa44a7ee9638503b91af16a062098400f19 100644 (file)
--- 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)) )