From: Tom Rini Date: Sun, 8 Dec 2024 17:07:29 +0000 (-0600) Subject: docker: Ensure we use the cross toolchain for aarch64 on arm64 X-Git-Tag: v2025.04-rc1~17^2~33^2~3 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a18235dd1a3a63393a096fcd1c288d2499dda91f;p=thirdparty%2Fu-boot.git docker: Ensure we use the cross toolchain for aarch64 on arm64 We do not want to use the host toolchain for building our platforms in CI (it is both too old, and would be inconsistent with our CI practices). To do this we need to set the toolchain-prefix so that we don't end up guessing "/opt/.../aarch64-linux-aarch64-linux-" as the prefix. Link: https://source.denx.de/u-boot/custodians/u-boot-dm/-/issues/32 Signed-off-by: Tom Rini Reviewed-by: Simon Glass --- diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index 38a9c4b9ec6..5d77e2b6269 100644 --- a/tools/docker/Dockerfile +++ b/tools/docker/Dockerfile @@ -323,6 +323,9 @@ RUN /bin/echo -e "kernelorg = /opt/gcc-${TCVER}-nolibc/*" >> ~/.buildman RUN if [ "$TARGETPLATFORM" = "linux/amd64" ]; then \ /bin/echo -e "\n[toolchain-prefix]\nxtensa = /opt/2020.07/xtensa-dc233c-elf/bin/xtensa-dc233c-elf-" >> ~/.buildman; \ fi +RUN if [ "$TARGETPLATFORM" = "linux/arm64" ]; then \ + /bin/echo -e "\n[toolchain-prefix]\naarch64 = /opt/gcc-${TCVER}-nolibc/aarch64-linux/bin/aarch64-linux-" >> ~/.buildman; \ + fi RUN /bin/echo -e "\n[toolchain-alias]\nsh = sh2" >> ~/.buildman RUN /bin/echo -e "\nx86 = i386" >> ~/.buildman;