Skip to content

Commit be6f3ad

Browse files
authored
ci: install g++ for cross build (#10932)
1 parent 6622d6a commit be6f3ad

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

docker/build-tool/gnu/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ FROM datafuselabs/build-tool:base-${RUST_TOOLCHAIN}
44
ENV PKG_CONFIG_ALLOW_CROSS 1
55
RUN dpkg --add-architecture arm64 && \
66
apt-get update -yq && \
7-
apt-get install -yq libc6-arm64-cross libc6-dev-arm64-cross gcc-aarch64-linux-gnu && \
7+
apt-get install -yq libc6-arm64-cross libc6-dev-arm64-cross gcc-aarch64-linux-gnu g++-aarch64-linux-gnu && \
88
apt-get install -yq libdbus-1-dev libdbus-1-dev:arm64 && \
99
apt-get install -yq libssl-dev libssl-dev:arm64 zlib1g-dev zlib1g-dev:arm64
1010

docker/build-tool/musl/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,6 @@ RUN curl -sSfLo /tmp/musl-cross-make.tar.gz https://github.com/richfelker/musl-c
2525
ENV je_cv_pthread_getname_np no
2626
ENV C_INCLUDE_PATH /usr/local/${ARCH}-linux-musl/include/
2727
RUN ln -s ${ARCH}-linux-musl-gcc /usr/local/bin/musl-gcc
28+
RUN ln -s ${ARCH}-linux-musl-g++ /usr/local/bin/musl-g++
2829
RUN rustup target add ${ARCH}-unknown-linux-musl
29-
RUN printf "[target.${ARCH}-unknown-linux-musl]\nlinker = \"${ARCH}-linux-musl-gcc\"\n" > ${CARGO_HOME}/config
30+
RUN printf "[target.${ARCH}-unknown-linux-musl]\nlinker = \"${ARCH}-linux-musl-gcc\"\n" >${CARGO_HOME}/config

0 commit comments

Comments
 (0)