ci/angle: Use lld-19 for linking ANGLE

This fixes the linking issues on newer ANGLE versions.

Fixes: 9707746b2d ("ci/lava: Build ANGLE for arm64")
Signed-off-by: Valentine Burley <valentine.burley@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33513>
This commit is contained in:
Valentine Burley
2025-02-12 16:39:08 +01:00
committed by Marge Bot
parent e977c6968f
commit 93569f3a8f
3 changed files with 3 additions and 3 deletions

View File

@@ -133,7 +133,7 @@ fi
export HOST_AR="$AR"
export NM="nm"
export HOST_NM="$NM"
export LDFLAGS="-lpthread -ldl"
export LDFLAGS="-fuse-ld=lld-${LLVM_VERSION} -lpthread -ldl"
export HOST_LDFLAGS="$LDFLAGS"
gn gen out/Release

View File

@@ -161,7 +161,7 @@ CONTAINER_EPHEMERAL=(
libxcb-dri2-0-dev
libxkbcommon-dev
libwayland-dev
lld
"lld-${LLVM_VERSION}"
ninja-build
openssh-server
patch

View File

@@ -33,7 +33,7 @@ variables:
DEBIAN_TEST_ANDROID_TAG: "20250212-re-angle"
DEBIAN_TEST_GL_TAG: "20250204-fix-deqp"
DEBIAN_TEST_VK_TAG: "20250204-fix-deqp"
KERNEL_ROOTFS_TAG: "20250212-arm-angle"
KERNEL_ROOTFS_TAG: "20250212-fix-angle"
DEBIAN_PYUTILS_IMAGE: "debian/x86_64_pyutils"
DEBIAN_PYUTILS_TAG: "20250129-lavacli"