Code was organized in such a way that the --arch option
was being ignored.

https://bugs.freedesktop.org/show_bug.cgi?id=95489