fix cross-compilation issue with Numpy
reorder the if's for clarity
fix message sent to user during cross_compilation
Merge pull request #2175 from vrabaud:2.4