diff options
| author | Guillaume Gomez <guillaume1.gomez@gmail.com> | 2018-01-25 15:52:15 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-25 15:52:15 +0100 |
| commit | 3a863a3f456bf64658256d05cf51df61e957d74b (patch) | |
| tree | f1ebe9a830ae912b85d2d2830a80affeaf471beb | |
| parent | df55cee0e5f14d16a7a08c6eaa16a6997ef108fc (diff) | |
| parent | 583b382debc028d7003850ca6970798515a2fbee (diff) | |
| download | rust-3a863a3f456bf64658256d05cf51df61e957d74b.tar.gz rust-3a863a3f456bf64658256d05cf51df61e957d74b.zip | |
Rollup merge of #47700 - EdSchouten:cc104, r=kennytm
Remove workarounds for cc 1.0.3. Now that the Rust codebase depends on cc 1.0.4, there is no longer any need to specify a compiler for CloudABI manually. Cargo will automatically call into the right compiler executable.
| -rw-r--r-- | src/ci/docker/dist-various-2/Dockerfile | 7 | ||||
| -rwxr-xr-x | src/ci/docker/dist-various-2/build-cloudabi-toolchain.sh | 6 |
2 files changed, 0 insertions, 13 deletions
diff --git a/src/ci/docker/dist-various-2/Dockerfile b/src/ci/docker/dist-various-2/Dockerfile index d8f09bf47a4..5f342eb5705 100644 --- a/src/ci/docker/dist-various-2/Dockerfile +++ b/src/ci/docker/dist-various-2/Dockerfile @@ -47,13 +47,6 @@ ENV \ CC_x86_64_sun_solaris=x86_64-sun-solaris2.10-gcc \ CXX_x86_64_sun_solaris=x86_64-sun-solaris2.10-g++ -# FIXME(EdSchouten): Remove this once cc ≥1.0.4 has been merged. It can -# automatically pick the right compiler path. -ENV \ - AR_x86_64_unknown_cloudabi=x86_64-unknown-cloudabi-ar \ - CC_x86_64_unknown_cloudabi=x86_64-unknown-cloudabi-clang \ - CXX_x86_64_unknown_cloudabi=x86_64-unknown-cloudabi-clang++ - ENV TARGETS=x86_64-unknown-fuchsia ENV TARGETS=$TARGETS,aarch64-unknown-fuchsia ENV TARGETS=$TARGETS,sparcv9-sun-solaris diff --git a/src/ci/docker/dist-various-2/build-cloudabi-toolchain.sh b/src/ci/docker/dist-various-2/build-cloudabi-toolchain.sh index d64da436639..8c04d849e8d 100755 --- a/src/ci/docker/dist-various-2/build-cloudabi-toolchain.sh +++ b/src/ci/docker/dist-various-2/build-cloudabi-toolchain.sh @@ -40,12 +40,6 @@ ln -s ../lib/llvm-5.0/bin/clang /usr/bin/${target}-c++ ln -s ../lib/llvm-5.0/bin/lld /usr/bin/${target}-ld ln -s ../../${target} /usr/lib/llvm-5.0/${target} -# FIXME(EdSchouten): Remove this once cc ≥1.0.4 has been merged. It -# can make use of ${target}-cc and ${target}-c++, without incorrectly -# assuming it's MSVC. -ln -s ../lib/llvm-5.0/bin/clang /usr/bin/${target}-clang -ln -s ../lib/llvm-5.0/bin/clang /usr/bin/${target}-clang++ - # Install the C++ runtime libraries from CloudABI Ports. echo deb https://nuxi.nl/distfiles/cloudabi-ports/debian/ cloudabi cloudabi > \ /etc/apt/sources.list.d/cloudabi.list |