diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2017-02-08 11:41:05 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-02-10 14:24:08 +0000 |
| commit | 0d4dd0ad65ea01dd6236fe4414b766624476991c (patch) | |
| tree | 661c5930fc52083a1e9f02d58131f8180e8ece34 | |
| parent | 13e64fc668d999cbfa362eb63ad4307deaf98391 (diff) | |
Fix rsp linking on windows
Rsp file format is not correct currently on windows,
as a workaround use selfmade rsp file.
Task-number: QTBUG-58710
Change-Id: I0cd6f3f5e29285330b1abbb30177bbd56f064e0d
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| -rw-r--r-- | src/core/core_module.pro | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/src/core/core_module.pro b/src/core/core_module.pro index a7853e524..584ef83ae 100644 --- a/src/core/core_module.pro +++ b/src/core/core_module.pro @@ -26,15 +26,14 @@ use?(gn){ isEmpty(NINJA_LIBS): error("Missing library files from QtWebEngineCore linking pri") NINJA_OBJECTS = $$eval($$list($$NINJA_OBJECTS)) # Do manual response file linking for macOS and Linux - unix { - RSP_FILE = $$OUT_PWD/$$getConfigDir()/$${TARGET}.rsp - for(object, NINJA_OBJECTS): RSP_CONTENT += $$object - write_file($$RSP_FILE, RSP_CONTENT) - macos:LIBS_PRIVATE += -Wl,-filelist,$$shell_quote($$RSP_FILE) - linux:LIBS_PRIVATE += @$$RSP_FILE - } else { - OBJECTS = $$NINJA_OBJECTS - } + + RSP_FILE = $$OUT_PWD/$$getConfigDir()/$${TARGET}.rsp + for(object, NINJA_OBJECTS): RSP_CONTENT += $$object + write_file($$RSP_FILE, RSP_CONTENT) + macos:LIBS_PRIVATE += -Wl,-filelist,$$shell_quote($$RSP_FILE) + linux:LIBS_PRIVATE += @$$RSP_FILE + # QTBUG-58710 add main rsp file on windows + win32:QMAKE_LFLAGS += @$$RSP_FILE linux: LIBS_PRIVATE += -Wl,--start-group $$NINJA_ARCHIVES -Wl,--end-group else: LIBS_PRIVATE += $$NINJA_ARCHIVES LIBS_PRIVATE += $$NINJA_LIB_DIRS $$NINJA_LIBS |