Skip to content

Commit 439292b

Browse files
committed
Auto merge of rust-lang#109163 - hi-rustin:rustin-patch-dockerfile, r=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`.
2 parents 6502613 + c4939f1 commit 439292b

File tree

1 file changed

+5
-4
lines changed
  • src/ci/docker/host-x86_64/dist-x86_64-illumos

1 file changed

+5
-4
lines changed

src/ci/docker/host-x86_64/dist-x86_64-illumos/Dockerfile

+5-4
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ RUN bash /tmp/cross-apt-packages.sh
99
# Required for cross-build gcc
1010
RUN apt-get update && \
1111
apt-get install -y --no-install-recommends \
12-
libgmp-dev \
13-
libmpfr-dev \
14-
libmpc-dev \
15-
&& rm -rf /var/lib/apt/lists/*
12+
libgmp-dev \
13+
libmpfr-dev \
14+
libmpc-dev \
15+
&& rm -rf /var/lib/apt/lists/*
1616

1717
COPY scripts/illumos-toolchain.sh /tmp/
1818

@@ -28,6 +28,7 @@ RUN /scripts/cmake.sh
2828

2929
ENV \
3030
AR_x86_64_unknown_illumos=x86_64-illumos-ar \
31+
RANLIB_x86_64_unknown_illumos=x86_64-illumos-ranlib \
3132
CC_x86_64_unknown_illumos=x86_64-illumos-gcc \
3233
CXX_x86_64_unknown_illumos=x86_64-illumos-g++
3334

0 commit comments

Comments
 (0)