non-linux-build-fix.diff
