Fix bug with arch-independent builds