Treat nmake the same as dmake (expand 6544e9b1a)

Already applied upstream