build system: fix for non-i386 builds
5 files changed