i bite the bullet, and moved to msys2. it requires a little more porting, but leads to better code in the long run IMHO