Don't require variant to be specified. Move EXTRA_OPTIONS output to where the rest of the build info is.