diff options
| author | Mårten Nordheim <marten.nordheim@qt.io> | 2022-10-24 12:42:12 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-10-25 14:57:19 +0000 |
| commit | a3d7619ce61d7afc295b8049f86d562a89cdcb32 (patch) | |
| tree | f01582c6a3ef0b73db42fb296f59f812c4654d97 | |
| parent | b3f15cae22355eb95660a44b2e7c6981fe78ac15 (diff) | |
| download | qtbase-a3d7619ce61d7afc295b8049f86d562a89cdcb32.tar.gz | |
Allow specifying different linkers for MinGW
Locally I cannot build Qt with the default ld linker.
Only enabled bfd and lld because mold and gold is not available
for Windows.
Change-Id: Ib57562b07219acc47f53fe5b0944f54d9c2a6ba6
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit 481fb5a06a139ea47342ad1e0aa334484bb5104b)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | configure.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/configure.cmake b/configure.cmake index 0896125703..999c9133a8 100644 --- a/configure.cmake +++ b/configure.cmake @@ -54,7 +54,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' @@ -80,7 +80,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' |