As a note, this has been committed so that forward progress can be made and cmake tests are still running even if Makefile based ones aren't for the option based unittests. http://llvm-reviews.chandlerc.com/D102