From 4309217aaddec4822e02ced53660815d810a9cef Mon Sep 17 00:00:00 2001 From: pasta Date: Thu, 6 Feb 2025 02:23:42 -0600 Subject: [PATCH] always install --- contrib/containers/ci/Dockerfile | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/contrib/containers/ci/Dockerfile b/contrib/containers/ci/Dockerfile index 27afddb52ff80..71dc2498653c7 100644 --- a/contrib/containers/ci/Dockerfile +++ b/contrib/containers/ci/Dockerfile @@ -138,17 +138,15 @@ ENV LD_LIBRARY_PATH="/usr/lib/llvm-${LLVM_VERSION}/lib" # ----------------------------------------------------------------------------- RUN set -ex; \ ARCH="$(dpkg --print-architecture)"; \ - if [ "${ARCH}" = "amd64" || "${ARCH}" = "arm64"]; then \ - echo "Installing cross-compiler for ARM on amd64"; \ - apt-get update && apt-get install $APT_ARGS \ - gcc-arm-linux-gnueabihf \ - g++-arm-linux-gnueabihf; \ - \ - # Create symlinks for the ARM cross-compiler. - # (Ubuntu Jammy typically installs versioned binaries—adjust the version if needed.) - ln -sf /usr/bin/arm-linux-gnueabihf-gcc-11 /usr/bin/arm-linux-gnueabihf-gcc; \ - ln -sf /usr/bin/arm-linux-gnueabihf-g++-11 /usr/bin/arm-linux-gnueabihf-g++; \ - fi; \ + echo "Installing cross-compiler for ARM on amd64"; \ + apt-get update && apt-get install $APT_ARGS \ + gcc-arm-linux-gnueabihf \ + g++-arm-linux-gnueabihf; \ + \ + # Create symlinks for the ARM cross-compiler. + # (Ubuntu Jammy typically installs versioned binaries—adjust the version if needed.) + ln -sf /usr/bin/arm-linux-gnueabihf-gcc-11 /usr/bin/arm-linux-gnueabihf-gcc; \ + ln -sf /usr/bin/arm-linux-gnueabihf-g++-11 /usr/bin/arm-linux-gnueabihf-g++; \ if [ "${ARCH}" = "arm64" ]; then \ echo "Installing cross-compiler for x86_64 on arm64"; \ apt-get update && apt-get install $APT_ARGS \