variables instead of overwriting those variables.  This makes it more flexible
and keeps some of the test Makefiles from breaking.

llvm-svn: 7025