CB-7368 --archs="x86" now produces correct binaries.