From fac8f02b6c75a1e51433b894ff6c217ac1499531 Mon Sep 17 00:00:00 2001
From: Mark Horvath <mark.horvath@arm.com>
Date: Fri, 5 Apr 2024 13:36:10 +0200
Subject: [PATCH] Remove an unnecessary docker configuration step

---
 .gitlab-ci.yml    | 2 +-
 docker/Dockerfile | 6 ------
 scripts/ci.sh     | 3 ++-
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e6faead61..0bfc66d87 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,7 +2,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-image: registry.gitlab.arm.com/intrinsiccv/intrinsiccv:8
+image: registry.gitlab.arm.com/intrinsiccv/intrinsiccv:9
 
 # Only run CI for main branch & merge requests
 workflow:
diff --git a/docker/Dockerfile b/docker/Dockerfile
index f11ae3287..e3dfabced 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -62,12 +62,6 @@ RUN if [ $(dpkg --print-architecture) = amd64 ]; then \
     && rm -rf libclang-rt* \
     ; fi
 
-# Hacks required to run tests on an x86 host.
-RUN if [ $(dpkg --print-architecture) = amd64 ]; then \
-    ln -sf /usr/aarch64-linux-gnu/lib/ld-linux-aarch64.so.1 /lib \
-    ; fi
-ENV LD_LIBRARY_PATH=/usr/aarch64-linux-gnu/lib
-
 RUN pipx install cpplint==1.6.1
 RUN pipx install gcovr==6.0
 RUN pipx install reuse==3.0.0
diff --git a/scripts/ci.sh b/scripts/ci.sh
index 25086dfb0..3eda8c4f9 100755
--- a/scripts/ci.sh
+++ b/scripts/ci.sh
@@ -43,7 +43,8 @@ echo '{"Checks": "-*,cppcoreguidelines-avoid-goto"}'>build/.clang-tidy
 ninja -C build
 
 # Build with GCC
-CC=aarch64-linux-gnu-gcc CXX=aarch64-linux-gnu-g++ cmake -S . -B build/gcc -G Ninja
+CC=aarch64-linux-gnu-gcc CXX=aarch64-linux-gnu-g++ cmake -S . -B build/gcc -G Ninja \
+  -DCMAKE_EXE_LINKER_FLAGS="-static"
 ninja -C build/gcc
 
 # Run tests
-- 
GitLab