Further attempts to fix cross-compiling