Cross-compilation patch 2 of 6