Merge pull request #12113 from protocolbuffers/deannagarcia-patch-3 Fix toolchain resolution for osx x86_64