This should address #9924 as GHC's config.guess/sub versions need to be
up to date anyway.

(cherry picked from commit 9ae78b0a)