|
63 | 63 | ca-certificates \
|
64 | 64 | ccache \
|
65 | 65 | cmake \
|
66 |
| - curl \ |
67 | 66 | cython3 \
|
68 | 67 | gcc-multilib \
|
69 | 68 | gdb \
|
@@ -324,27 +323,15 @@ RUN echo 'Installing python3 packages' >&2 \
|
324 | 323 | && pip3 install --no-cache-dir -r /tmp/requirements.txt \
|
325 | 324 | && rm /tmp/requirements.txt
|
326 | 325 |
|
327 |
| -# While sourcing ~/.cargo/env later would have the right short-term effect, |
328 |
| -# we'd still need to set the right path even later when HOME is |
329 |
| -# /data/riotbuild -- so setting it right away. |
330 |
| -ENV PATH ${PATH}:/opt/rustup/.cargo/bin |
331 |
| -# Install nightly Rust via rustup; this is needed for Rust-on-RIOT builds and |
332 |
| -# contains all CARGO_TARGETs currently recognized for RIOT targets. |
| 326 | +# Add Rust components needed for building, adding to installation from static-test-tools |
333 | 327 | #
|
334 |
| -# *_HOMEs moved to /opt to make them world readable. RUSTUP_HOME is set |
335 |
| -# persistently in case someone in their image wants to do a quick `sudo rustup |
336 |
| -# toolchain add` or similar; CARGO_HOME is not because the user will need to |
337 |
| -# write there, and all rustup does here is to place some binaries that later |
338 |
| -# fan out to RUSTUP_HOME anyway. |
| 328 | +# See static-test-tools/Dockerfile for why which variables are set how. |
339 | 329 | #
|
340 | 330 | # Components: rust-src is needed to run `-Z build-std=core`, which in turn is
|
341 | 331 | # needed on AVR (which thus doesn't need the avr-unknown-gnu-atmega328 target;
|
342 | 332 | # being able to build core might be useful for other targets as well).
|
343 |
| -ENV RUSTUP_HOME /opt/rustup/.rustup |
344 | 333 | RUN \
|
345 |
| - RUSTUP_HOME=/opt/rustup/.rustup \ |
346 | 334 | CARGO_HOME=/opt/rustup/.cargo sh -c "\
|
347 |
| - curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile minimal && \ |
348 | 335 | rustup component add rust-src && \
|
349 | 336 | rustup target add i686-unknown-linux-gnu && \
|
350 | 337 | rustup target add riscv32imac-unknown-none-elf && \
|
|
0 commit comments