Reintroduce setup.py changes from #8280 erased by piper import #8617 #8746
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #8667.
For an unknown reason (am I missing something?), setup.py changes from #8280 have been erased by piper import #8617 (see #8667 (comment)).
These changes are actually necessary for correct build of aarch64 python wheels.
without them, the aarch64 wheels will have python extension .so files with wrong arch suffix
x86_64-linux-gnu.so
,which results in failing to load the python C++ extension.
This is also basically what the broken tests reported by #8667 have detected.
This PR fixes the problem - as proven by a green adhoc run of the kokoro job (https://fusion2.corp.google.com/invocations/c1e5e71e-e779-48e7-8f0a-23b1d33a06b0/targets/protobuf%2Fgithub%2Fmaster%2Fubuntu%2Fpython_aarch64%2Fcontinuous/log)
One thing I haven't been able to explain is: