Cross-compilation patch 3 of 6