Re #8882. Add check for desired architecture.