rename --cpu (and related variables) to --arch as this option always