Update the fix for issue4064 to deal correctly with all three variants of universal builds that are presented by the configure script.
Update the fix for issue4064 to deal correctly with all three variants of
universal builds that are presented by the configure script.

pypa/setuptools,pypa/setuptools,pypa/setuptools