Issue #6610 - build on Intel Mac