One of the test Makefiles uses the same variable names for something else,
and this was probably interfering with it.

llvm-svn: 7024