From 3f48f4f9effaf00aa90651a028896801c65e8194 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Fri, 13 Sep 2024 18:43:00 +0200 Subject: [PATCH] platform_configs: try to use lld linker on u24.04 arm64 Task-number: QTBUG-128887 Pick-to: 6.8 Change-Id: I952f51560d5f01cc6093cd416c6ee49b9de7c922 Reviewed-by: Liang Qi Reviewed-by: Allan Sandfeld Jensen --- coin/platform_configs/cmake_platforms.yaml | 2 +- coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/02-apt.sh | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index dd414113076..5ba7469e767 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -44,7 +44,7 @@ Configurations: Template: 'qtci-linux-Ubuntu-24.04-aarch64-50' Compiler: 'GCC' Features: ['Sccache', 'UseConfigure', 'DoNotRunTests', 'StandaloneExamples'] - Configure arguments: '-make examples -developer-build -c++std c++20 -linker gold -qtlibinfix TestInfix -qtnamespace TestNamespace -qpa offscreen\;xcb' + Configure arguments: '-make examples -developer-build -c++std c++20 -linker lld -qtlibinfix TestInfix -qtnamespace TestNamespace -qpa offscreen\;xcb' Environment variables: [ 'COMMON_TEST_CMAKE_ARGS=-DQT_SKIP_DOCKER_COMPOSE=ON', 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}' diff --git a/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/02-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/02-apt.sh index 8c463379afe..0c38274b872 100644 --- a/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/02-apt.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/02-apt.sh @@ -231,6 +231,8 @@ installPackages+=(uml-utilities) installPackages+=(jq) # For building installPackages+=(cmake) +# extra linkers +installPackages+=(lld) echo "Running update for apt" waitLoop