I'm not clear how this changes things by removing one of the or entries. Seems that makes it less likely to define NPY_DISABLE_HIGHWAY_SORT. Is that the intent?

Yes, AIUI, Highway fixed the issues with clang sanitizers so we need to make this static check match the dynamic check inside highway.

@charris this mirrors the logic in https://github.com/google/highway/blob/master/hwy/contrib/sort/shared-inl.h#L130-L138, we keep missing this as we do updates to Highway 🙀

It has annoyed me sufficiently to get around to raising google/highway#2421 so we can maintain the checks in one place - this is a stop-gap until that lands and we have a more permanent fix.

Thanks for your patience and quick fix @ngoldbaum! Hopefully the last time we need to fix this 😸