Add cross-compilation patch from #1695