Skip to content

Commit

Permalink
platform_configs: try to use lld linker on u24.04 arm64
Browse files Browse the repository at this point in the history
Task-number: QTBUG-128887
Pick-to: 6.8
Change-Id: I952f51560d5f01cc6093cd416c6ee49b9de7c922
Reviewed-by: Liang Qi <[email protected]>
Reviewed-by: Allan Sandfeld Jensen <[email protected]>
  • Loading branch information
liangqi committed Sep 14, 2024
1 parent 9be8bb7 commit 3f48f4f
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 1 addition & 1 deletion coin/platform_configs/cmake_platforms.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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}}'
Expand Down
2 changes: 2 additions & 0 deletions coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/02-apt.sh
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,8 @@ installPackages+=(uml-utilities)
installPackages+=(jq)
# For building
installPackages+=(cmake)
# extra linkers
installPackages+=(lld)

echo "Running update for apt"
waitLoop
Expand Down

0 comments on commit 3f48f4f

Please sign in to comment.