Skip to content

Commit 4eec3af

Browse files
authored
linux-x64: use rust nightly (#283)
1 parent 6c6aa23 commit 4eec3af

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

platforms/linux-arm64v8/Dockerfile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@ RUN \
4444
ln -s /usr/bin/gcc10-strip /usr/bin/strip && \
4545
ln -s /usr/bin/gcc10-ranlib /usr/bin/ranlib && \
4646
ln -s /usr/bin/gcc10-readelf /usr/bin/readelf && \
47+
ln -sf /usr/bin/gcc10-ld.bfd /usr/bin/gcc10-ld && \
48+
rm /usr/bin/gcc10-ld.gold && \
4749
curl https://sh.rustup.rs -sSf | sh -s -- -y \
4850
--no-modify-path \
4951
--profile minimal \
@@ -58,8 +60,8 @@ RUN \
5860
ENV \
5961
PKG_CONFIG="pkg-config --static" \
6062
PLATFORM="linux-arm64v8" \
61-
FLAGS="-march=armv8-a -fuse-ld=bfd" \
62-
RUSTFLAGS="-Clink-arg=-fuse-ld=bfd -Zlocation-detail=none -Zfmt-debug=none" \
63+
FLAGS="-march=armv8-a" \
64+
RUSTFLAGS="-Zlocation-detail=none -Zfmt-debug=none" \
6365
MESON="--cross-file=/root/meson.ini"
6466

6567
COPY Toolchain.cmake /root/

platforms/linux-x64/Dockerfile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,12 @@ RUN \
4444
ln -s /usr/bin/gcc10-strip /usr/bin/strip && \
4545
ln -s /usr/bin/gcc10-ranlib /usr/bin/ranlib && \
4646
ln -s /usr/bin/gcc10-readelf /usr/bin/readelf && \
47+
ln -sf /usr/bin/gcc10-ld.bfd /usr/bin/gcc10-ld && \
48+
rm /usr/bin/gcc10-ld.gold && \
4749
curl https://sh.rustup.rs -sSf | sh -s -- -y \
4850
--no-modify-path \
4951
--profile minimal \
52+
--default-toolchain nightly \
5053
&& \
5154
cargo install cargo-c --locked && \
5255
ln -s /usr/bin/cmake3 /usr/bin/cmake && \
@@ -56,8 +59,8 @@ RUN \
5659
ENV \
5760
PKG_CONFIG="pkg-config --static" \
5861
PLATFORM="linux-x64" \
59-
FLAGS="-march=nehalem -fuse-ld=bfd" \
60-
RUSTFLAGS="-Clink-arg=-fuse-ld=bfd" \
62+
FLAGS="-march=nehalem" \
63+
RUSTFLAGS="-Zlocation-detail=none -Zfmt-debug=none" \
6164
MESON="--cross-file=/root/meson.ini"
6265

6366
COPY Toolchain.cmake /root/

0 commit comments

Comments
 (0)