diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2020-08-27 12:37:08 +0200 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2020-08-31 04:15:45 +0000 |
| commit | a919a1627da3301ee7691912f16d8c048d15c288 (patch) | |
| tree | f5eeff00bc72935f0b6e006f2ddb279d44526a16 /src/buildtools/config/linking.pri | |
| parent | 0f444e1cadd8c7b53ca7dcdb1cc88d7642e80d23 (diff) | |
Do not use rsp file when static linking
This supposed to be covered by ff50fbf but got lost in
following patchsets and static ios build did not complain
about it.
Change-Id: Ie4e34dc12d942442824ba1f0e3483bed682b3157
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Diffstat (limited to 'src/buildtools/config/linking.pri')
| -rw-r--r-- | src/buildtools/config/linking.pri | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/buildtools/config/linking.pri b/src/buildtools/config/linking.pri index e4f40ba71..e76f6ef10 100644 --- a/src/buildtools/config/linking.pri +++ b/src/buildtools/config/linking.pri @@ -25,28 +25,31 @@ for(archive, NINJA_ARCHIVES): RSP_A_CONTENT += $$archive write_file($$RSP_ARCHIVE_FILE, RSP_A_CONTENT) if(macos|ios) { - QMAKE_LFLAGS += -Wl,-filelist,$$shell_quote($${RSP_OBJECT_FILE}) !static { + QMAKE_LFLAGS += -Wl,-filelist,$$shell_quote($${RSP_OBJECT_FILE}) QMAKE_LFLAGS += @$${RSP_ARCHIVE_FILE} } else { + OBJECTS += $$NINJA_OBJECTS LIBS_PRIVATE += $${NINJA_ARCHIVES} } } linux { - QMAKE_LFLAGS += @$${RSP_OBJECT_FILE} !static { + QMAKE_LFLAGS += @$${RSP_OBJECT_FILE} QMAKE_LFLAGS += -Wl,--start-group @$${RSP_ARCHIVE_FILE} -Wl,--end-group } else { + OBJECTS += $$NINJA_OBJECTS LIBS_PRIVATE += -Wl,--start-group @$${NINJA_ARCHIVES} -Wl,--end-group } } win32 { - QMAKE_LFLAGS += @$${RSP_OBJECT_FILE} !static { + QMAKE_LFLAGS += @$${RSP_OBJECT_FILE} QMAKE_LFLAGS += @$${RSP_ARCHIVE_FILE} } else { + OBJECTS += $$NINJA_OBJECTS LIBS_PRIVATE += $${NINJA_ARCHIVES} } } |