Merge pull request #1634 from ColinFinck/fix-mingw

Fix MinGW bootstrap build.