diff options
| author | bors <bors@rust-lang.org> | 2019-03-29 08:14:41 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-03-29 08:14:41 +0000 |
| commit | 003382e4150984cb476047b3925edf8d75df2d59 (patch) | |
| tree | 2d72c3517e7bb92371f2e7c01b379da97d185975 /src/ci/docker/scripts | |
| parent | 4fec737f9aad565ef0351c38f147b78394b7a8ac (diff) | |
| parent | 456fa39031f908490a112356373afa3535878a38 (diff) | |
| download | rust-003382e4150984cb476047b3925edf8d75df2d59.tar.gz rust-003382e4150984cb476047b3925edf8d75df2d59.zip | |
Auto merge of #59513 - Centril:rollup, r=Centril
Rollup of 11 pull requests
Successful merges:
- #58019 (Combine all builtin late lints and make lint checking parallel)
- #59358 (Use `track_errors` instead of hand rolling)
- #59394 (warn -> deny duplicate match bindings)
- #59401 (bootstrap: build crates under libtest with -Z emit-stack-sizes)
- #59423 (Visit path in `walk_mac`)
- #59468 (musl: build toolchain libs with -fPIC)
- #59476 (Use `SmallVec` in `TokenStreamBuilder`.)
- #59496 (Remove unnecessary with_globals calls)
- #59498 (Use 'write_all' instead of 'write' in example code)
- #59503 (Stablize {f32,f64}::copysign().)
- #59511 (Fix missed fn rename in #59284)
Failed merges:
r? @ghost
Diffstat (limited to 'src/ci/docker/scripts')
| -rw-r--r-- | src/ci/docker/scripts/musl-toolchain.sh | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/ci/docker/scripts/musl-toolchain.sh b/src/ci/docker/scripts/musl-toolchain.sh index 95b7c2869c9..3caf2852ede 100644 --- a/src/ci/docker/scripts/musl-toolchain.sh +++ b/src/ci/docker/scripts/musl-toolchain.sh @@ -29,6 +29,10 @@ TARGET=$ARCH-linux-musl OUTPUT=/usr/local shift +# Ancient binutils versions don't understand debug symbols produced by more recent tools. +# Apparently applying `-fPIC` everywhere allows them to link successfully. +export CFLAGS="-fPIC $CFLAGS" + git clone https://github.com/richfelker/musl-cross-make -b v0.9.7 cd musl-cross-make |