mirror of
https://github.com/rust-lang/rust.git
synced 2025-05-14 02:49:40 +00:00
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`.
This commit is contained in:
commit
439292bc79
@ -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++
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user