diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2020-04-29 16:30:13 +0200 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2020-05-04 14:58:15 +0200 |
| commit | 54257fed0dd142b9b5128ff130cdc1325fad764a (patch) | |
| tree | 3b0ad206e208707c3d18c93507b9d171e424d036 /src/core | |
| parent | 08aa603e8c28b23d2b30983e8b16149ae0b3abb1 (diff) | |
Add archives rsp file for linker on macos
Add archive rsp files for windows and macos to
avoid long argument list for linker.
Fixes: QTBUG-83731
Change-Id: Ib71bc6494e1958d745c0d99ddb792f7ae1d84505
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/core_module.pro | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/core/core_module.pro b/src/core/core_module.pro index d7e2ab8da..5007012ac 100644 --- a/src/core/core_module.pro +++ b/src/core/core_module.pro @@ -29,12 +29,11 @@ write_file($$RSP_OBJECT_FILE, RSP_O_CONTENT) RSP_ARCHIVE_FILE = $$OUT_PWD/$$getConfigDir()/$${TARGET}_a.rsp for(archive, NINJA_ARCHIVES): RSP_A_CONTENT += $$archive write_file($$RSP_ARCHIVE_FILE, RSP_A_CONTENT) -macos:LIBS_PRIVATE += -Wl,-filelist,$$shell_quote($$RSP_OBJECT_FILE) -linux:QMAKE_LFLAGS += @$${RSP_OBJECT_FILE} -# QTBUG-58710 add main rsp file on windows -win32:QMAKE_LFLAGS += @$${RSP_OBJECT_FILE} -linux:QMAKE_LFLAGS += -Wl,--start-group @$${RSP_ARCHIVE_FILE} -Wl,--end-group -else: LIBS_PRIVATE += $$NINJA_ARCHIVES + +macos:LIBS_PRIVATE += -Wl,-filelist,$$shell_quote($${RSP_OBJECT_FILE}) @$${RSP_ARCHIVE_FILE} +linux:QMAKE_LFLAGS += @$${RSP_OBJECT_FILE} -Wl,--start-group @$${RSP_ARCHIVE_FILE} -Wl,--end-group +win32:QMAKE_LFLAGS += @$${RSP_OBJECT_FILE} @$${RSP_ARCHIVE_FILE} + LIBS_PRIVATE += $$NINJA_LIB_DIRS $$NINJA_LIBS # GN's LFLAGS doesn't always work across all the Linux configurations we support. # The Windows and macOS ones from GN does provide a few useful flags however |