@@ -24,7 +24,8 @@ RUN apt-get update && apt-get build-dep -y clang llvm && apt-get install -y --no
24
24
# Needed for apt-key to work:
25
25
dirmngr \
26
26
gpg-agent \
27
- g++-9-arm-linux-gnueabi
27
+ g++-9-arm-linux-gnueabi \
28
+ gcc-riscv64-linux-gnu
28
29
29
30
RUN apt-key adv --batch --yes --keyserver keyserver.ubuntu.com --recv-keys 74DA7924C5513486
30
31
RUN add-apt-repository -y 'deb https://apt.dilos.org/dilos dilos2 main'
@@ -74,6 +75,11 @@ RUN env \
74
75
CXX=arm-linux-gnueabi-g++-9 CXXFLAGS="-march=armv7-a" \
75
76
bash musl.sh armv7 && \
76
77
rm -rf /build/*
78
+ RUN env \
79
+ CC=riscv64-linux-gnu-gcc \
80
+ CXX=riscv64-linux-gnu-gcc \
81
+ bash musl.sh riscv64gc && \
82
+ rm -rf /build/*
77
83
78
84
WORKDIR /tmp
79
85
COPY scripts/shared.sh /tmp/
@@ -127,6 +133,7 @@ ENV TARGETS=$TARGETS,loongarch64-unknown-none-softfloat
127
133
ENV TARGETS=$TARGETS,aarch64-unknown-uefi
128
134
ENV TARGETS=$TARGETS,i686-unknown-uefi
129
135
ENV TARGETS=$TARGETS,x86_64-unknown-uefi
136
+ ENV TARGETS=$TARGETS,riscv64gc-unknown-linux-musl
130
137
131
138
# As per https://bugs.launchpad.net/ubuntu/+source/gcc-defaults/+bug/1300211
132
139
# we need asm in the search path for gcc-9 (for gnux32) but not in the search path of the
@@ -137,6 +144,7 @@ RUN ln -s /usr/include/x86_64-linux-gnu/asm /usr/local/include/asm
137
144
ENV RUST_CONFIGURE_ARGS --enable-extended --enable-lld --disable-docs \
138
145
--set target.wasm32-wasi.wasi-root=/wasm32-wasi \
139
146
--set target.wasm32-wasi-preview1-threads.wasi-root=/wasm32-wasi-preview1-threads \
140
- --musl-root-armv7=/musl-armv7
147
+ --musl-root-armv7=/musl-armv7 \
148
+ --musl-root-riscv64gc=/musl-riscv64gc
141
149
142
150
ENV SCRIPT python3 ../x.py dist --host='' --target $TARGETS
0 commit comments