Merging r143807:

chandlerc · chandlerc · commit 36cbea60ff66 · 2011-11-07T10:21:56.000Z
------------------------------------------------------------------------
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.
------------------------------------------------------------------------

llvm-svn: 143936
diff --git a/clang/test/lit.cfg b/clang/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)) )
