diff options
| author | bors <bors@rust-lang.org> | 2019-05-12 09:19:28 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-05-12 09:19:28 +0000 |
| commit | efa3c27f0ff21960b9309f8036dbf3e7416b9e52 (patch) | |
| tree | f1550ddfdd584ca10e0e1decaebb8b22c388fbd1 /src/ci/docker/scripts | |
| parent | 16e356ebdfa42b754c1497f1c58caacbe2f25d03 (diff) | |
| parent | 0caa251da2d7272fdecb32aae6e0a9e1c3ec0756 (diff) | |
| download | rust-efa3c27f0ff21960b9309f8036dbf3e7416b9e52.tar.gz rust-efa3c27f0ff21960b9309f8036dbf3e7416b9e52.zip | |
Auto merge of #60474 - mati865:musl_toolchain, r=alexcrichton
Make tests compatible with musl host As an alternative to passing explicit linker all over the place I could try linking `cc` to musl gcc since this bootstraps itself. Assigning for discussion: r? @alexcrichton
Diffstat (limited to 'src/ci/docker/scripts')
| -rw-r--r-- | src/ci/docker/scripts/musl-toolchain.sh | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/ci/docker/scripts/musl-toolchain.sh b/src/ci/docker/scripts/musl-toolchain.sh index 8cdbfebea4d..d5988a25671 100644 --- a/src/ci/docker/scripts/musl-toolchain.sh +++ b/src/ci/docker/scripts/musl-toolchain.sh @@ -45,6 +45,15 @@ cd - ln -s $OUTPUT/$TARGET/lib/libc.so /lib/ld-musl-$ARCH.so.1 echo $OUTPUT/$TARGET/lib >> /etc/ld-musl-$ARCH.path +# Now when musl bootstraps itself create proper toolchain symlinks to make build and tests easier +if [ "$REPLACE_CC" = "1" ]; then + for exec in cc gcc; do + ln -s $TARGET-gcc /usr/local/bin/$exec + done + for exec in cpp c++ g++; do + ln -s $TARGET-g++ /usr/local/bin/$exec + done +fi export CC=$TARGET-gcc export CXX=$TARGET-g++ |