-
Notifications
You must be signed in to change notification settings - Fork 12.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Re-do the FreeBSD cross-builds to use Clang and libc++. Fixes #44433.
The main goal here is to use FreeBSD's normal libc++, instead of statically linking the libstdc++ packaged with GCC, because that libstdc++ has bugs that cause rustc to deadlock inside LLVM. But the easiest way to use libc++ is to switch the build from GCC to Clang, and the Clang package in the Ubuntu image already knows how to cross-compile (given a sysroot and preferably cross-binutils), so the toolchain script now uses that instead of building a custom compiler. This also de-duplicates the `build-toolchain.sh` script.
- Loading branch information
Showing
6 changed files
with
115 additions
and
234 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,103 @@ | ||
| #!/bin/bash | ||
| # Copyright 2016-2017 The Rust Project Developers. See the COPYRIGHT | ||
| # file at the top-level directory of this distribution and at | ||
| # http://rust-lang.org/COPYRIGHT. | ||
| # | ||
| # Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or | ||
| # http://www.apache.org/licenses/LICENSE-2.0> or the MIT license | ||
| # <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your | ||
| # option. This file may not be copied, modified, or distributed | ||
| # except according to those terms. | ||
|
|
||
| set -eux | ||
|
|
||
| arch=$1 | ||
| binutils_version=2.25.1 | ||
| freebsd_version=10.3 | ||
| triple=$arch-unknown-freebsd10 | ||
| sysroot=/usr/local/$triple | ||
|
|
||
| hide_output() { | ||
| set +x | ||
| local on_err=" | ||
| echo ERROR: An error was encountered with the build. | ||
| cat /tmp/build.log | ||
| exit 1 | ||
| " | ||
| trap "$on_err" ERR | ||
| bash -c "while true; do sleep 30; echo \$(date) - building ...; done" & | ||
| local ping_loop_pid=$! | ||
| $@ &> /tmp/build.log | ||
| trap - ERR | ||
| kill $ping_loop_pid | ||
| set -x | ||
| } | ||
|
|
||
| # First up, build binutils | ||
| mkdir binutils | ||
| cd binutils | ||
| curl https://ftp.gnu.org/gnu/binutils/binutils-${binutils_version}.tar.bz2 | tar xjf - | ||
| mkdir binutils-build | ||
| cd binutils-build | ||
| hide_output ../binutils-${binutils_version}/configure \ | ||
| --target="$triple" --with-sysroot="$sysroot" | ||
| hide_output make -j"$(getconf _NPROCESSORS_ONLN)" | ||
| hide_output make install | ||
| cd ../.. | ||
| rm -rf binutils | ||
|
|
||
| # Next, download the FreeBSD libraries and header files | ||
| mkdir -p "$sysroot" | ||
| case $arch in | ||
| (x86_64) freebsd_arch=amd64 ;; | ||
| (i686) freebsd_arch=i386 ;; | ||
| esac | ||
|
|
||
| files_to_extract=( | ||
| "./usr/include" | ||
| "./usr/lib/*crt*.o" | ||
| ) | ||
| # Try to unpack only the libraries the build needs, to save space. | ||
| for lib in c cxxrt gcc_s m thr util; do | ||
| files_to_extract=("${files_to_extract[@]}" "./lib/lib${lib}.*" "./usr/lib/lib${lib}.*") | ||
| done | ||
| for lib in c++ c_nonshared compiler_rt execinfo gcc pthread rt ssp_nonshared; do | ||
| files_to_extract=("${files_to_extract[@]}" "./usr/lib/lib${lib}.*") | ||
| done | ||
|
|
||
| URL=https://download.freebsd.org/ftp/releases/${freebsd_arch}/${freebsd_version}-RELEASE/base.txz | ||
| curl "$URL" | tar xJf - -C "$sysroot" --wildcards "${files_to_extract[@]}" | ||
|
|
||
| # Fix up absolute symlinks from the system image. This can be removed | ||
| # for FreeBSD 11. (If there's an easy way to make them relative | ||
| # symlinks instead, feel free to change this.) | ||
| set +x | ||
| find "$sysroot" -type l | while read symlink_path; do | ||
| symlink_target=$(readlink "$symlink_path") | ||
| case $symlink_target in | ||
| (/*) | ||
| echo "Fixing symlink ${symlink_path} -> ${sysroot}${symlink_target}" >&2 | ||
| ln -nfs "${sysroot}${symlink_target}" "${symlink_path}" ;; | ||
| esac | ||
| done | ||
| set -x | ||
|
|
||
| # Clang can do cross-builds out of the box, if we give it the right | ||
| # flags. (The local binutils seem to work, but they set the ELF | ||
| # header "OS/ABI" (EI_OSABI) field to SysV rather than FreeBSD, so | ||
| # there might be other problems.) | ||
| # | ||
| # The --target option is last because the cross-build of LLVM uses | ||
| # --target without an OS version ("-freebsd" vs. "-freebsd10"). This | ||
| # makes Clang default to libstdc++ (which no longer exists), and also | ||
| # controls other features, like GNU-style symbol table hashing and | ||
| # anything predicated on the version number in the __FreeBSD__ | ||
| # preprocessor macro. | ||
| for tool in clang clang++; do | ||
| tool_path=/usr/local/bin/${triple}-${tool} | ||
| cat > "$tool_path" <<EOF | ||
| #!/bin/sh | ||
| exec $tool --sysroot=$sysroot --prefix=${sysroot}/bin "\$@" --target=$triple | ||
| EOF | ||
| chmod +x "$tool_path" | ||
| done |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters