Skip to content

Commit

Permalink
Auto merge of rust-lang#109163 - hi-rustin:rustin-patch-dockerfile, r…
Browse files Browse the repository at this point in the history
…=Mark-Simulacrum

Add RANLIB_x86_64_unknown_illumos env for dist-x86_64-illumos dockerfile

close rust-lang/cc-rs#798

We already set `AR_x86_64_unknown_illumos` in the dockerfile. So it is reasonable to set the `RANLIB_x86_64_unknown_illumos`.
  • Loading branch information
bors committed Mar 22, 2023
2 parents 6502613 + c4939f1 commit 439292b
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions src/ci/docker/host-x86_64/dist-x86_64-illumos/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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/

Expand All @@ -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++

Expand Down

0 comments on commit 439292b

Please sign in to comment.