Skip to content

Commit 8f92148

Browse files
committed
Promote riscv64gc-unknown-linux-musl to tier 2
1 parent d03d6c0 commit 8f92148

File tree

2 files changed

+11
-2
lines changed

2 files changed

+11
-2
lines changed

src/ci/docker/host-x86_64/dist-various-2/Dockerfile

+10-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ RUN apt-get update && apt-get build-dep -y clang llvm && apt-get install -y --no
2424
# Needed for apt-key to work:
2525
dirmngr \
2626
gpg-agent \
27-
g++-9-arm-linux-gnueabi
27+
g++-9-arm-linux-gnueabi \
28+
gcc-riscv64-linux-gnu
2829

2930
RUN apt-key adv --batch --yes --keyserver keyserver.ubuntu.com --recv-keys 74DA7924C5513486
3031
RUN add-apt-repository -y 'deb https://apt.dilos.org/dilos dilos2 main'
@@ -74,6 +75,11 @@ RUN env \
7475
CXX=arm-linux-gnueabi-g++-9 CXXFLAGS="-march=armv7-a" \
7576
bash musl.sh armv7 && \
7677
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/*
7783

7884
WORKDIR /tmp
7985
COPY scripts/shared.sh /tmp/
@@ -126,6 +132,7 @@ ENV TARGETS=$TARGETS,loongarch64-unknown-none-softfloat
126132
ENV TARGETS=$TARGETS,aarch64-unknown-uefi
127133
ENV TARGETS=$TARGETS,i686-unknown-uefi
128134
ENV TARGETS=$TARGETS,x86_64-unknown-uefi
135+
ENV TARGETS=$TARGETS,riscv64gc-unknown-linux-musl
129136

130137
# As per https://bugs.launchpad.net/ubuntu/+source/gcc-defaults/+bug/1300211
131138
# we need asm in the search path for gcc-9 (for gnux32) but not in the search path of the
@@ -134,6 +141,7 @@ ENV TARGETS=$TARGETS,x86_64-unknown-uefi
134141
RUN ln -s /usr/include/x86_64-linux-gnu/asm /usr/local/include/asm
135142

136143
ENV RUST_CONFIGURE_ARGS --enable-extended --enable-lld --enable-llvm-bitcode-linker --disable-docs \
137-
--musl-root-armv7=/musl-armv7
144+
--musl-root-armv7=/musl-armv7 \
145+
--musl-root-riscv64gc=/musl-riscv64gc
138146

139147
ENV SCRIPT python3 ../x.py dist --host='' --target $TARGETS

src/tools/build-manifest/src/main.rs

+1
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,7 @@ static TARGETS: &[&str] = &[
139139
"riscv64gc-unknown-hermit",
140140
"riscv64gc-unknown-none-elf",
141141
"riscv64gc-unknown-linux-gnu",
142+
"riscv64gc-unknown-linux-musl",
142143
"s390x-unknown-linux-gnu",
143144
"sparc64-unknown-linux-gnu",
144145
"sparcv9-sun-solaris",

0 commit comments

Comments
 (0)