Skip to content

Commit

Permalink
always install
Browse files Browse the repository at this point in the history
  • Loading branch information
PastaPastaPasta committed Feb 6, 2025
1 parent f1d4cc4 commit 4309217
Showing 1 changed file with 9 additions and 11 deletions.
20 changes: 9 additions & 11 deletions contrib/containers/ci/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down

0 comments on commit 4309217

Please sign in to comment.