am cc3d3913: am 85f5c420: am e8d64956: Merge change I6b913ab8 into eclair

Merge commit 'cc3d39135124776ca2d36d6e973bc5b332fa9cbf'

* commit 'cc3d39135124776ca2d36d6e973bc5b332fa9cbf':
  Fix toolchain scripts for Darwin and Cygwin.