am b1170856: Fix windows-specific error without messing up Makefile flags.

* commit 'b11708563832338f6850e8cef081ec6842b5cc05':
  Fix windows-specific error without messing up Makefile flags.