about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2017-07-28 14:26:02 -0700
committerAlex Crichton <alex@alexcrichton.com>2017-07-28 14:26:27 -0700
commit122fd188aefa4d275e23880fc9836f664cd08582 (patch)
treeabed74afb0892d23a999c294de1183816953b219
parenteba9d7f08ce5c90549ee52337aca0010ad566f0d (diff)
downloadrust-122fd188aefa4d275e23880fc9836f664cd08582.tar.gz
rust-122fd188aefa4d275e23880fc9836f664cd08582.zip
rustbuild: Update cross-compilers for FreeBSD
When working through bugs for the LLVM 5.0 upgrade it looks like the FreeBSD
cross compilers we're currently using are unable to build LLVM, failing with
references to the function `std::to_string` claiming it doesn't exist. I don't
actually know what this function is, but assuming that it was added in a more
recent version of a C++ standard I've updated the gcc versions for the
toolchains we're using. This made the error go away!
-rwxr-xr-xsrc/ci/docker/dist-i686-freebsd/build-toolchain.sh4
-rwxr-xr-xsrc/ci/docker/dist-x86_64-freebsd/build-toolchain.sh4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/ci/docker/dist-i686-freebsd/build-toolchain.sh b/src/ci/docker/dist-i686-freebsd/build-toolchain.sh
index 5642e6fc937..8343327c33b 100755
--- a/src/ci/docker/dist-i686-freebsd/build-toolchain.sh
+++ b/src/ci/docker/dist-i686-freebsd/build-toolchain.sh
@@ -13,7 +13,7 @@ set -ex
 
 ARCH=$1
 BINUTILS=2.25.1
-GCC=5.3.0
+GCC=6.4.0
 
 hide_output() {
   set +x
@@ -86,7 +86,7 @@ rm -rf freebsd
 # Finally, download and build gcc to target FreeBSD
 mkdir gcc
 cd gcc
-curl https://ftp.gnu.org/gnu/gcc/gcc-$GCC/gcc-$GCC.tar.bz2 | tar xjf -
+curl https://ftp.gnu.org/gnu/gcc/gcc-$GCC/gcc-$GCC.tar.gz | tar xzf -
 cd gcc-$GCC
 ./contrib/download_prerequisites
 
diff --git a/src/ci/docker/dist-x86_64-freebsd/build-toolchain.sh b/src/ci/docker/dist-x86_64-freebsd/build-toolchain.sh
index 5642e6fc937..8343327c33b 100755
--- a/src/ci/docker/dist-x86_64-freebsd/build-toolchain.sh
+++ b/src/ci/docker/dist-x86_64-freebsd/build-toolchain.sh
@@ -13,7 +13,7 @@ set -ex
 
 ARCH=$1
 BINUTILS=2.25.1
-GCC=5.3.0
+GCC=6.4.0
 
 hide_output() {
   set +x
@@ -86,7 +86,7 @@ rm -rf freebsd
 # Finally, download and build gcc to target FreeBSD
 mkdir gcc
 cd gcc
-curl https://ftp.gnu.org/gnu/gcc/gcc-$GCC/gcc-$GCC.tar.bz2 | tar xjf -
+curl https://ftp.gnu.org/gnu/gcc/gcc-$GCC/gcc-$GCC.tar.gz | tar xzf -
 cd gcc-$GCC
 ./contrib/download_prerequisites