diff options
| author | Dylan DPC <dylan.dpc@gmail.com> | 2020-11-29 03:14:22 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-29 03:14:22 +0100 |
| commit | c9c81d92a96531d72782fb24f923e972facab6f4 (patch) | |
| tree | fa17f6a0748c60fb7533df768a947e04a00a71a4 | |
| parent | ca8a1b05c62d05d82fb6d5480dc9e4b4fdad1ce4 (diff) | |
| parent | 7e00222aab90df9f09e23be01c2c7fb6a5044e6a (diff) | |
| download | rust-c9c81d92a96531d72782fb24f923e972facab6f4.tar.gz rust-c9c81d92a96531d72782fb24f923e972facab6f4.zip | |
Rollup merge of #79484 - sreehax:master, r=Mark-Simulacrum
add enable-full-tools to freebsd builds to prevent occasional link er… On FreeBSD, there is sometimes an issue where linking a rust program will fail due to rust not finding a linker, even though lld is included in the base system. This seems to mostly affect bare metal/cross compilation things, such as wasm builds and arm/riscv bare metal work (eg. when trying to compile [this](https://github.com/quantumscraps/scraps)). On Linux and other operating systems, full tools are enabled for builds of rust, so there are no linking issues. This pr should enable fully functional builds on FreeBSD, assuming rust builds correctly with these options.
| -rw-r--r-- | src/ci/docker/host-x86_64/dist-x86_64-freebsd/Dockerfile | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/ci/docker/host-x86_64/dist-x86_64-freebsd/Dockerfile b/src/ci/docker/host-x86_64/dist-x86_64-freebsd/Dockerfile index 1075947c9cf..8413d775ac4 100644 --- a/src/ci/docker/host-x86_64/dist-x86_64-freebsd/Dockerfile +++ b/src/ci/docker/host-x86_64/dist-x86_64-freebsd/Dockerfile @@ -30,5 +30,10 @@ ENV \ ENV HOSTS=x86_64-unknown-freebsd -ENV RUST_CONFIGURE_ARGS --enable-extended --enable-profiler --enable-sanitizers --disable-docs +ENV RUST_CONFIGURE_ARGS \ + --enable-full-tools \ + --enable-extended \ + --enable-profiler \ + --enable-sanitizers \ + --disable-docs ENV SCRIPT python3 ../x.py dist --host $HOSTS --target $HOSTS |