Add cross compile support, revert test change now that rustc is updated.