And make sure we really use the host to check what contrib to use in the configure.

You don't have to re-run bootstrap from contrib after make from contrib when building for x86_64-darwin.