diff options
| author | Chandler Carruth <chandlerc@gmail.com> | 2011-11-07 10:21:56 +0000 |
|---|---|---|
| committer | Chandler Carruth <chandlerc@gmail.com> | 2011-11-07 10:21:56 +0000 |
| commit | 36cbea60ff66070ee4936c48f7b6e32eb581384f (patch) | |
| tree | b67b3f343ad5516add4d7f5c6091ec5ff9dd7420 | |
| parent | 4e61d20111f8769edae6ac51d964b7f75b474f05 (diff) | |
| download | llvm-36cbea60ff66070ee4936c48f7b6e32eb581384f.tar.gz | |
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.
------------------------------------------------------------------------
llvm-svn: 143936
| -rw-r--r-- | clang/test/lit.cfg | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/clang/test/lit.cfg b/clang/test/lit.cfg index a7430db02338..35f38aa44a7e 100644 --- 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)) ) |