build-system-fix.diff