Appease buildbots after r185956: just set -mcpu explicitly, as it should have been from the beginning.