From 481fb5a06a139ea47342ad1e0aa334484bb5104b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5rten=20Nordheim?= Date: Mon, 24 Oct 2022 12:42:12 +0200 Subject: [PATCH] Allow specifying different linkers for MinGW MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Locally I cannot build Qt with the default ld linker. Only enabled bfd and lld because mold and gold is not available for Windows. Pick-to: 6.4 6.2 Change-Id: Ib57562b07219acc47f53fe5b0944f54d9c2a6ba6 Reviewed-by: Jörg Bornemann --- configure.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.cmake b/configure.cmake index eaa642f471..d5ab6385bf 100644 --- a/configure.cmake +++ b/configure.cmake @@ -144,7 +144,7 @@ qt_feature("use_bfd_linker" PRIVATE LABEL "bfd" AUTODETECT false - CONDITION NOT WIN32 AND NOT INTEGRITY AND NOT WASM AND TEST_use_bfd_linker + CONDITION NOT MSVC AND NOT INTEGRITY AND NOT WASM AND TEST_use_bfd_linker ENABLE INPUT_linker STREQUAL 'bfd' DISABLE INPUT_linker STREQUAL 'gold' OR INPUT_linker STREQUAL 'lld' OR INPUT_linker STREQUAL 'mold' @@ -170,7 +170,7 @@ qt_feature("use_lld_linker" PRIVATE LABEL "lld" AUTODETECT false - CONDITION NOT WIN32 AND NOT INTEGRITY AND NOT WASM AND TEST_use_lld_linker + CONDITION NOT MSVC AND NOT INTEGRITY AND NOT WASM AND TEST_use_lld_linker ENABLE INPUT_linker STREQUAL 'lld' DISABLE INPUT_linker STREQUAL 'bfd' OR INPUT_linker STREQUAL 'gold' OR INPUT_linker STREQUAL 'mold'