build/Make: Try to switch over to llvm-config-2 again, now that I've cleaned up

some more of the explicit dependencies. I'm staging things more slowly this time
in case there is more unanticipated fallout.

llvm-svn: 144323