> I think the patch is wrong.  why would you want to differentiate between native and cross builds?

Because the multiarch headers are incompatible with my SDK's headers, and because of the -I ordering they override mine. I tried swapping the order of calls without a difference, but excluding them entirely made it work.

I'll happily take suggestions for a better patch. I don't even know what the multiarch headers are for, but I don't seem to need them here.