[cvs-nhc98] patch applied (yhc): Add a little bit more trickery to try and get GMP detection working again