From 67121bd82bc7affe1dee2797ef778b6a51f7af10 Mon Sep 17 00:00:00 2001 From: Kleis Auke Wolthuizen Date: Tue, 8 Jul 2025 15:00:10 +0200 Subject: [PATCH] Linux: avoid using gold as the linker --- platforms/linux-arm64v8/Dockerfile | 6 +++--- platforms/linux-x64/Dockerfile | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/platforms/linux-arm64v8/Dockerfile b/platforms/linux-arm64v8/Dockerfile index cec1e568..0cc97765 100644 --- a/platforms/linux-arm64v8/Dockerfile +++ b/platforms/linux-arm64v8/Dockerfile @@ -40,7 +40,7 @@ RUN \ ln -s /usr/bin/gcc10-as /usr/bin/as && \ ln -s /usr/bin/gcc10-ar /usr/bin/ar && \ ln -s /usr/bin/gcc10-nm /usr/bin/nm && \ - ln -s /usr/bin/gcc10-ld /usr/bin/ld && \ + ln -s /usr/bin/gcc10-ld.bfd /usr/bin/ld && \ ln -s /usr/bin/gcc10-strip /usr/bin/strip && \ ln -s /usr/bin/gcc10-ranlib /usr/bin/ranlib && \ ln -s /usr/bin/gcc10-readelf /usr/bin/readelf && \ @@ -58,8 +58,8 @@ RUN \ ENV \ PKG_CONFIG="pkg-config --static" \ PLATFORM="linux-arm64v8" \ - FLAGS="-march=armv8-a" \ - RUSTFLAGS="-Zlocation-detail=none -Zfmt-debug=none" \ + FLAGS="-march=armv8-a -fuse-ld=bfd" \ + RUSTFLAGS="-Clink-arg=-fuse-ld=bfd -Zlocation-detail=none -Zfmt-debug=none" \ MESON="--cross-file=/root/meson.ini" COPY Toolchain.cmake /root/ diff --git a/platforms/linux-x64/Dockerfile b/platforms/linux-x64/Dockerfile index bc92daac..f91d31ae 100644 --- a/platforms/linux-x64/Dockerfile +++ b/platforms/linux-x64/Dockerfile @@ -40,7 +40,7 @@ RUN \ ln -s /usr/bin/gcc10-g++ /usr/bin/c++ && \ ln -s /usr/bin/gcc10-ar /usr/bin/ar && \ ln -s /usr/bin/gcc10-nm /usr/bin/nm && \ - ln -s /usr/bin/gcc10-ld /usr/bin/ld && \ + ln -s /usr/bin/gcc10-ld.bfd /usr/bin/ld && \ ln -s /usr/bin/gcc10-strip /usr/bin/strip && \ ln -s /usr/bin/gcc10-ranlib /usr/bin/ranlib && \ ln -s /usr/bin/gcc10-readelf /usr/bin/readelf && \ @@ -56,7 +56,8 @@ RUN \ ENV \ PKG_CONFIG="pkg-config --static" \ PLATFORM="linux-x64" \ - FLAGS="-march=nehalem" \ + FLAGS="-march=nehalem -fuse-ld=bfd" \ + RUSTFLAGS="-Clink-arg=-fuse-ld=bfd" \ MESON="--cross-file=/root/meson.ini" COPY Toolchain.cmake /root/