Separate out Makefile defines so that we can keep the llvm