Cross-compilation patch 5 of 6