Restored cross-compilation