Skip to content

Commit

Permalink
Auto merge of #43530 - alexcrichton:update-freebsd-compilers, r=Mark-…
Browse files Browse the repository at this point in the history
…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!
  • Loading branch information
bors committed Jul 29, 2017
2 parents 8d0ad26 + 122fd18 commit 91aff57
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions src/ci/docker/dist-i686-freebsd/build-toolchain.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ set -ex

ARCH=$1
BINUTILS=2.25.1
GCC=5.3.0
GCC=6.4.0

hide_output() {
set +x
Expand Down Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions src/ci/docker/dist-x86_64-freebsd/build-toolchain.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ set -ex

ARCH=$1
BINUTILS=2.25.1
GCC=5.3.0
GCC=6.4.0

hide_output() {
set +x
Expand Down Expand Up @@ -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

Expand Down

0 comments on commit 91aff57

Please sign in to comment.