Merge topic 'macos-no-per-arch-sysroot' into release-4.2

1925477cb7 macOS: Do not incorrectly search for per-arch SDKs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11372