diff options
| author | bors <bors@rust-lang.org> | 2023-03-22 11:45:52 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-03-22 11:45:52 +0000 |
| commit | 439292bc7913399e406d9bb7e8da0f70c6317c6e (patch) | |
| tree | 4d073e62d3ccc05ef2feba513a9f08847966ce09 /src/ci/docker | |
| parent | 6502613a8199cab4cb68b08c7ddce6f210d8d69c (diff) | |
| parent | c4939f1eb21ebfd0903ad2be751064029289fab9 (diff) | |
| download | rust-439292bc7913399e406d9bb7e8da0f70c6317c6e.tar.gz rust-439292bc7913399e406d9bb7e8da0f70c6317c6e.zip | |
Auto merge of #109163 - hi-rustin:rustin-patch-dockerfile, r=Mark-Simulacrum
Add RANLIB_x86_64_unknown_illumos env for dist-x86_64-illumos dockerfile close https://github.com/rust-lang/cc-rs/issues/798 We already set `AR_x86_64_unknown_illumos` in the dockerfile. So it is reasonable to set the `RANLIB_x86_64_unknown_illumos`.
Diffstat (limited to 'src/ci/docker')
| -rw-r--r-- | src/ci/docker/host-x86_64/dist-x86_64-illumos/Dockerfile | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/ci/docker/host-x86_64/dist-x86_64-illumos/Dockerfile b/src/ci/docker/host-x86_64/dist-x86_64-illumos/Dockerfile index 4e46bdee5ac..2089bf38716 100644 --- a/src/ci/docker/host-x86_64/dist-x86_64-illumos/Dockerfile +++ b/src/ci/docker/host-x86_64/dist-x86_64-illumos/Dockerfile @@ -9,10 +9,10 @@ RUN bash /tmp/cross-apt-packages.sh # Required for cross-build gcc RUN apt-get update && \ apt-get install -y --no-install-recommends \ - libgmp-dev \ - libmpfr-dev \ - libmpc-dev \ - && rm -rf /var/lib/apt/lists/* + libgmp-dev \ + libmpfr-dev \ + libmpc-dev \ + && rm -rf /var/lib/apt/lists/* COPY scripts/illumos-toolchain.sh /tmp/ @@ -28,6 +28,7 @@ RUN /scripts/cmake.sh ENV \ AR_x86_64_unknown_illumos=x86_64-illumos-ar \ + RANLIB_x86_64_unknown_illumos=x86_64-illumos-ranlib \ CC_x86_64_unknown_illumos=x86_64-illumos-gcc \ CXX_x86_64_unknown_illumos=x86_64-illumos-g++ |