[cfe-commits] r143807 - /cfe/trunk/test/lit.cfg

[Chandler Carruth]

Author: chandlerc
Date: Sat Nov  5 05:41:42 2011
New Revision: 143807

URL: http://llvm.org/viewvc/llvm-project?rev=143807&view=rev
Log:
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.

Modified:
    cfe/trunk/test/lit.cfg

Modified: cfe/trunk/test/lit.cfg
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/lit.cfg?rev=143807&r1=143806&r2=143807&view=diff
==============================================================================
--- cfe/trunk/test/lit.cfg (original)
+++ cfe/trunk/test/lit.cfg Sat Nov  5 05:41:42 2011
@@ -147,7 +147,9 @@
 # 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)) )