Merge "Fix mclinker mingw build"