Use correct CPU_VARIANT