Merge change I6b913ab8 into eclair

* changes:
  Fix toolchain scripts for Darwin and Cygwin.