From ea71bdfdb9e8f21f825fd8c3c60b3718e7d14077 Mon Sep 17 00:00:00 2001 From: silverqx Date: Mon, 26 Aug 2024 20:08:23 +0200 Subject: [PATCH] qmake MSYS2 disabled LLD linker override for g++ LLD isn't faster than bfd, I also did linking when bfd was faster than LLD. - also updated docs [skip ci] --- .env.mingw.example | 2 +- conf.pri.example | 2 +- docs/building/hello-world.mdx | 2 +- docs/building/migrations.mdx | 2 +- drivers/conf.pri.example | 2 +- examples/tom/conf.pri.example | 2 +- tests/conf.pri.example | 2 +- tests/testdata_tom/conf.pri.example | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.env.mingw.example b/.env.mingw.example index 8814af579..ade41a392 100644 --- a/.env.mingw.example +++ b/.env.mingw.example @@ -3,7 +3,7 @@ # Use alternative linker (for both GCC and Clang) # CONFIG *= use_lld_linker does not work on MinGW -QMAKE_LFLAGS *= -fuse-ld=lld +#QMAKE_LFLAGS *= -fuse-ld=lld # vcpkg - range-v3 and tabulate TINY_VCPKG_ROOT = $$quote(C:/msys64/home/xyz/Code/vcpkg/) diff --git a/conf.pri.example b/conf.pri.example index a7fee2c2d..10512a3c8 100644 --- a/conf.pri.example +++ b/conf.pri.example @@ -105,7 +105,7 @@ win32-g++|win32-clang-g++ { # Use alternative linker (for both GCC and Clang) # CONFIG *= use_lld_linker does not work on MinGW - QMAKE_LFLAGS *= -fuse-ld=lld +# QMAKE_LFLAGS *= -fuse-ld=lld # Nothing to do, auto-configuration is enabled !disable_autoconf: return() diff --git a/docs/building/hello-world.mdx b/docs/building/hello-world.mdx index cbc9d3b63..f6b491f4c 100644 --- a/docs/building/hello-world.mdx +++ b/docs/building/hello-world.mdx @@ -609,7 +609,7 @@ TINY_VCPKG_TRIPLET = x64-mingw-dynamic # Use alternative linker (for both GCC and Clang) # CONFIG *= use_lld_linker does not work on MinGW -QMAKE_LFLAGS *= -fuse-ld=lld +#QMAKE_LFLAGS *= -fuse-ld=lld ``` diff --git a/docs/building/migrations.mdx b/docs/building/migrations.mdx index 40306cb19..0143310b0 100644 --- a/docs/building/migrations.mdx +++ b/docs/building/migrations.mdx @@ -749,7 +749,7 @@ TINY_VCPKG_TRIPLET = x64-mingw-dynamic # Use alternative linker (for both GCC and Clang) # CONFIG *= use_lld_linker does not work on MinGW -QMAKE_LFLAGS *= -fuse-ld=lld +#QMAKE_LFLAGS *= -fuse-ld=lld ``` diff --git a/drivers/conf.pri.example b/drivers/conf.pri.example index 333c79a39..abc27c713 100644 --- a/drivers/conf.pri.example +++ b/drivers/conf.pri.example @@ -13,7 +13,7 @@ win32-g++|win32-clang-g++ { # Use alternative linker (for both GCC and Clang) # CONFIG *= use_lld_linker does not work on MinGW - QMAKE_LFLAGS *= -fuse-ld=lld +# QMAKE_LFLAGS *= -fuse-ld=lld # Nothing to do, auto-configuration is enabled !disable_autoconf: return() diff --git a/examples/tom/conf.pri.example b/examples/tom/conf.pri.example index d9ce3179f..98bb26ea9 100644 --- a/examples/tom/conf.pri.example +++ b/examples/tom/conf.pri.example @@ -26,7 +26,7 @@ win32-g++|win32-clang-g++ { # Use alternative linker (for both GCC and Clang) # CONFIG *= use_lld_linker does not work on MinGW - QMAKE_LFLAGS *= -fuse-ld=lld +# QMAKE_LFLAGS *= -fuse-ld=lld # Nothing to do, auto-configuration is enabled !disable_autoconf: return() diff --git a/tests/conf.pri.example b/tests/conf.pri.example index db2d8ae45..ab58d988f 100644 --- a/tests/conf.pri.example +++ b/tests/conf.pri.example @@ -13,7 +13,7 @@ win32-g++|win32-clang-g++ { # Use alternative linker (for both GCC and Clang) # CONFIG *= use_lld_linker does not work on MinGW - QMAKE_LFLAGS *= -fuse-ld=lld +# QMAKE_LFLAGS *= -fuse-ld=lld # Nothing to do, auto-configuration is enabled !disable_autoconf: return() diff --git a/tests/testdata_tom/conf.pri.example b/tests/testdata_tom/conf.pri.example index db2d8ae45..ab58d988f 100644 --- a/tests/testdata_tom/conf.pri.example +++ b/tests/testdata_tom/conf.pri.example @@ -13,7 +13,7 @@ win32-g++|win32-clang-g++ { # Use alternative linker (for both GCC and Clang) # CONFIG *= use_lld_linker does not work on MinGW - QMAKE_LFLAGS *= -fuse-ld=lld +# QMAKE_LFLAGS *= -fuse-ld=lld # Nothing to do, auto-configuration is enabled !disable_autoconf: return()