Skip to content

Commit 91aff57

Browse files
committed
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!
2 parents 8d0ad26 + 122fd18 commit 91aff57

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/ci/docker/dist-i686-freebsd/build-toolchain.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ set -ex
1313

1414
ARCH=$1
1515
BINUTILS=2.25.1
16-
GCC=5.3.0
16+
GCC=6.4.0
1717

1818
hide_output() {
1919
set +x
@@ -86,7 +86,7 @@ rm -rf freebsd
8686
# Finally, download and build gcc to target FreeBSD
8787
mkdir gcc
8888
cd gcc
89-
curl https://ftp.gnu.org/gnu/gcc/gcc-$GCC/gcc-$GCC.tar.bz2 | tar xjf -
89+
curl https://ftp.gnu.org/gnu/gcc/gcc-$GCC/gcc-$GCC.tar.gz | tar xzf -
9090
cd gcc-$GCC
9191
./contrib/download_prerequisites
9292

src/ci/docker/dist-x86_64-freebsd/build-toolchain.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ set -ex
1313

1414
ARCH=$1
1515
BINUTILS=2.25.1
16-
GCC=5.3.0
16+
GCC=6.4.0
1717

1818
hide_output() {
1919
set +x
@@ -86,7 +86,7 @@ rm -rf freebsd
8686
# Finally, download and build gcc to target FreeBSD
8787
mkdir gcc
8888
cd gcc
89-
curl https://ftp.gnu.org/gnu/gcc/gcc-$GCC/gcc-$GCC.tar.bz2 | tar xjf -
89+
curl https://ftp.gnu.org/gnu/gcc/gcc-$GCC/gcc-$GCC.tar.gz | tar xzf -
9090
cd gcc-$GCC
9191
./contrib/download_prerequisites
9292

0 commit comments

Comments
 (0)