Merging r143842:

chandlerc · chandlerc · commit ae95127c7eff · 2011-11-07T10:32:55.000Z
------------------------------------------------------------------------
r143842 | chandlerc | 2011-11-05 16:29:28 -0700 (Sat, 05 Nov 2011) | 3 lines

Switch Lit to directly query the driver for the builtin inclue path.
Thanks to Peter for pointing out how easy this is to do. I'm now much
happier with this solution.
------------------------------------------------------------------------

llvm-svn: 143944
diff --git a/clang/test/lit.cfg b/clang/test/lit.cfg
@@ -148,25 +148,19 @@ if not lit.quiet:
 # Note that when substituting %clang_cc1 also fill in the include directory of
 # the builtin headers. Those are part of even a freestanding environment, but
 # Clang relies on the driver to locate them.
-def getClangVersion(clang):
+def getClangBuiltinIncludeDir(clang):
     # FIXME: Rather than just getting the version, we should have clang print
     # out its resource dir here in an easy to scrape form.
-    cmd = subprocess.Popen([clang, '-v'], stderr=subprocess.PIPE)
+    cmd = subprocess.Popen([clang, '-print-file-name=include'],
+                           stdout=subprocess.PIPE)
+    if not cmd.stdout:
+      lit.fatal("Couldn't find the include dir for Clang ('%s')" % clang)
+    return cmd.stdout.read().strip()
 
-    for line in cmd.stderr:
-        m = re.match( r'^clang version ([^ ]+) ', line)
-        if m is not None:
-            return m.group(1)
-
-    lit.fatal("Couldn't find the version of Clang ('%s')" % clang)
-
-clang_directory = os.path.dirname(os.path.realpath(config.clang))
-clang_builtin_includes = os.path.join(os.path.dirname(clang_directory),
-                                      'lib', 'clang',
-                                      getClangVersion(config.clang), 'include')
 config.substitutions.append( ('%clang_cc1',
                               '%s -cc1 -internal-nosysroot-isystem %s'
-                              % (config.clang, clang_builtin_includes)) )
+                              % (config.clang,
+                                 getClangBuiltinIncludeDir(config.clang))) )
 
 config.substitutions.append( ('%clangxx', ' ' + config.clang +
                               ' -ccc-clang-cxx -ccc-cxx '))
