Cross-compilation patch 4 of 6