From 6e48d654d72b076de2cbccb3a72f9800eb515b39 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Thu, 19 Aug 2021 22:23:01 +0200 Subject: [PATCH] Don't force lld for Android when clang is used This reverts commit 64c111e10fcb2f69855432177d76649b6b789fac. The claim of the commit message, that we cannot use the gold linker, does not seem to be true (anymore?). This is underlined by the fact that CMake *forces* the gold linker for Android, whenever LTCG is enabled (see Modules/Compiler/Clang.cmake as of CMake 3.21.1). Change-Id: I90edac8555be4abdd44cd367228aeffb0d66b895 Reviewed-by: Alexandru Croitor Reviewed-by: Qt CI Bot --- cmake/QtInternalTargets.cmake | 9 --------- 1 file changed, 9 deletions(-) diff --git a/cmake/QtInternalTargets.cmake b/cmake/QtInternalTargets.cmake index 22080b4d536..317deb185a6 100644 --- a/cmake/QtInternalTargets.cmake +++ b/cmake/QtInternalTargets.cmake @@ -131,15 +131,6 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" AND CMAKE_SYSTEM_NAME STREQUAL " target_compile_options(PlatformCommonInternal INTERFACE -Wno-ignored-attributes) endif() -# We can't use the gold linker on android with the NDK, which is the default -# linker. To build our own target we will use the lld linker. -# TODO: Why not? -# Linking Android libs with lld on Windows sometimes deadlocks. Don't use lld on -# Windows. qmake doesn't use lld to build Android on any host platform. -if (ANDROID AND NOT CMAKE_HOST_WIN32) - target_link_options(PlatformModuleInternal INTERFACE -fuse-ld=lld) -endif() - target_compile_definitions(PlatformCommonInternal INTERFACE $<$>:QT_NO_DEBUG>) function(qt_internal_apply_bitcode_flags target)