Reintroduce setup.py changes from #8280 erased by piper import #8902 #8966
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.
This fixes the broken python aarch64 linux tests (see https://source.cloud.google.com/results/invocations/861e900c-12ad-4998-9489-18f5cfbf76ee)
For some reason (bad merge?), the changes needed for crosscompiling aarch64 python wheels have been removed in piper import https://github.com/protocolbuffers/protobuf/pull/8902/files#diff-eb8b42d9346d0a5d371facf21a8bfa2d16fb49e213ae7c21f03863accebe0fcfL161.
This is actually the second time this happened (see #8667 and the fix #8746). What can we do to make sure this won't happen again?