@@ -2,11 +2,24 @@ FROM ubuntu:16.04
22
33RUN apt-get update && apt-get install -y --no-install-recommends \
44 g++ \
5+ automake \
6+ bison \
7+ bzip2 \
8+ flex \
9+ help2man \
10+ libtool-bin \
11+ texinfo \
12+ unzip \
13+ wget \
14+ xz-utils \
15+ libncurses-dev \
16+ gawk \
517 make \
618 file \
719 curl \
820 ca-certificates \
921 python2.7 \
22+ python3 \
1023 git \
1124 cmake \
1225 sudo \
@@ -35,6 +48,18 @@ RUN add-apt-repository ppa:team-gcc-arm-embedded/ppa && \
3548 apt-get update && \
3649 apt-get install -y --no-install-recommends gcc-arm-embedded
3750
51+ COPY scripts/rustbuild-setup.sh dist-various-1/build-riscv-toolchain.sh dist-various-1/riscv64-unknown-linux-gnu.config dist-various-1/crosstool-ng.sh /build/
52+ RUN ./crosstool-ng.sh
53+
54+ # Crosstool-ng will refuse to build as root
55+ RUN sh ./rustbuild-setup.sh
56+ USER rustbuild
57+
58+ RUN ./build-riscv-toolchain.sh
59+
60+ USER root
61+ ENV PATH=/x-tools/riscv64-unknown-linux-gnu/bin:$PATH
62+
3863COPY dist-various-1/build-rumprun.sh /build
3964RUN ./build-rumprun.sh
4065
@@ -129,6 +154,7 @@ ENV TARGETS=$TARGETS,riscv32imc-unknown-none-elf
129154ENV TARGETS=$TARGETS,riscv32imac-unknown-none-elf
130155ENV TARGETS=$TARGETS,riscv64imac-unknown-none-elf
131156ENV TARGETS=$TARGETS,riscv64gc-unknown-none-elf
157+ ENV TARGETS=$TARGETS,riscv64gc-unknown-linux-gnu
132158ENV TARGETS=$TARGETS,armebv7r-none-eabi
133159ENV TARGETS=$TARGETS,armebv7r-none-eabihf
134160ENV TARGETS=$TARGETS,armv7r-none-eabi
@@ -147,6 +173,9 @@ ENV CC_mipsel_unknown_linux_musl=mipsel-openwrt-linux-gcc \
147173 CC_thumbv7neon_unknown_linux_gnueabihf=arm-linux-gnueabihf-gcc \
148174 AR_thumbv7neon_unknown_linux_gnueabihf=arm-linux-gnueabihf-ar \
149175 CXX_thumbv7neon_unknown_linux_gnueabihf=arm-linux-gnueabihf-g++ \
176+ CC_riscv64gc_unknown_linux_gnu=riscv64-unknown-linux-gnu-gcc \
177+ AR_riscv64gc_unknown_linux_gnu=riscv64-unknown-linux-gnu-ar \
178+ CXX_riscv64gc_unknown_linux_gnu=riscv64-unknown-linux-gnu-g++ \
150179 CC_riscv32i_unknown_none_elf=false \
151180 CC_riscv32imc_unknown_none_elf=false \
152181 CC_riscv32imac_unknown_none_elf=false \
0 commit comments