[llvm-branch-commits] [cfe-branch] r143936 - in /cfe/branches/release_30: ./ test/lit.cfg

[Chandler Carruth]

Author: chandlerc
Date: Mon Nov  7 04:21:56 2011
New Revision: 143936

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

Modified:
    cfe/branches/release_30/   (props changed)
    cfe/branches/release_30/test/lit.cfg

Propchange: cfe/branches/release_30/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov  7 04:21:56 2011
@@ -1,3 +1,3 @@
 /cfe/branches/type-system-rewrite:134693-134817
-/cfe/trunk:142113,142133-142134,142187,142349,142474,142476,142918,143344-143345,143684,143686-143687,143751-143752,143798,143801,143804-143806
+/cfe/trunk:142113,142133-142134,142187,142349,142474,142476,142918,143344-143345,143684,143686-143687,143751-143752,143798,143801,143804-143807
 /cfe/trunk/test/SemaTemplate:126920

Modified: cfe/branches/release_30/test/lit.cfg
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_30/test/lit.cfg?rev=143936&r1=143935&r2=143936&view=diff
==============================================================================
--- cfe/branches/release_30/test/lit.cfg (original)
+++ cfe/branches/release_30/test/lit.cfg Mon Nov  7 04:21:56 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)) )