Capture error output as well.
Try to generalize the XDEV support to non-ARM