The most recently landed PR actually makes this so `ignore-cross-compile` isn't necessary. The stack of commits will need to get rebase anyway, so just something to include in the rebasing.