Merge change I3f0d5eb5 into eclair

* changes:
  Update the build-toolchain.sh script.