diff options
| author | bors <bors@rust-lang.org> | 2017-07-29 08:48:57 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-07-29 08:48:57 +0000 |
| commit | 91aff5775d3b4a95e2b0c2fe50785f3d28fa3dd8 (patch) | |
| tree | 32d4645a17ddd53dabe53dbccf2ada4ddae6787d /src/ci/docker | |
| parent | 8d0ad26b955f21643bebe71518a74d1ecb3016ae (diff) | |
| parent | 122fd188aefa4d275e23880fc9836f664cd08582 (diff) | |
| download | rust-91aff5775d3b4a95e2b0c2fe50785f3d28fa3dd8.tar.gz rust-91aff5775d3b4a95e2b0c2fe50785f3d28fa3dd8.zip | |
Auto merge of #43530 - alexcrichton:update-freebsd-compilers, r=Mark-Simulacrum,cuviper
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!
Diffstat (limited to 'src/ci/docker')
| -rwxr-xr-x | src/ci/docker/dist-i686-freebsd/build-toolchain.sh | 4 | ||||
| -rwxr-xr-x | src/ci/docker/dist-x86_64-freebsd/build-toolchain.sh | 4 |
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 |