Now this works with and without --with-clang-srcdir, with and
without an out-of-tree build.

llvm-svn: 149749