diff options
| author | Mateusz Mikuła <matti@marinelayer.io> | 2019-05-10 16:12:32 +0200 |
|---|---|---|
| committer | Mateusz Mikuła <mati865@gmail.com> | 2019-05-10 16:12:47 +0200 |
| commit | 0caa251da2d7272fdecb32aae6e0a9e1c3ec0756 (patch) | |
| tree | cb068d2c2604b2653a9c7741d9db05bd8d205913 /src | |
| parent | f74debbe7d2bf43171270d5f3f5b42f2cc2e6243 (diff) | |
| download | rust-0caa251da2d7272fdecb32aae6e0a9e1c3ec0756.tar.gz rust-0caa251da2d7272fdecb32aae6e0a9e1c3ec0756.zip | |
Conditionally provide cc in musl-toolchain.sh
Diffstat (limited to 'src')
| -rw-r--r-- | src/ci/docker/dist-x86_64-musl/Dockerfile | 2 | ||||
| -rw-r--r-- | src/ci/docker/scripts/musl-toolchain.sh | 14 |
2 files changed, 9 insertions, 7 deletions
diff --git a/src/ci/docker/dist-x86_64-musl/Dockerfile b/src/ci/docker/dist-x86_64-musl/Dockerfile index bc3a3bd6fbc..385eefde846 100644 --- a/src/ci/docker/dist-x86_64-musl/Dockerfile +++ b/src/ci/docker/dist-x86_64-musl/Dockerfile @@ -23,7 +23,7 @@ COPY scripts/musl-toolchain.sh /build/ # We need to mitigate rust-lang/rust#34978 when compiling musl itself as well RUN CFLAGS="-Wa,-mrelax-relocations=no -Wa,--compress-debug-sections=none -Wl,--compress-debug-sections=none" \ CXXFLAGS="-Wa,-mrelax-relocations=no -Wa,--compress-debug-sections=none -Wl,--compress-debug-sections=none" \ - bash musl-toolchain.sh x86_64 && rm -rf build + REPLACE_CC=1 bash musl-toolchain.sh x86_64 && rm -rf build COPY scripts/sccache.sh /scripts/ RUN sh /scripts/sccache.sh diff --git a/src/ci/docker/scripts/musl-toolchain.sh b/src/ci/docker/scripts/musl-toolchain.sh index e132615738b..d5988a25671 100644 --- a/src/ci/docker/scripts/musl-toolchain.sh +++ b/src/ci/docker/scripts/musl-toolchain.sh @@ -46,12 +46,14 @@ 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 -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 +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++ |