do not add d suffix on non-windows (cherry picked from commit 27980491d3cac6166c30c4adc2c71d80c3e4e13a)