am 999fd4ea: Merge "Also -DWIN32 to keep llvm building."

* commit '999fd4ea850b494f38ac23195ad5c2ee0b9486a2':
  Also -DWIN32 to keep llvm building.