Modifications to cross-compilation scripts to reflect recent cmake changes