summaryrefslogtreecommitdiffstats
path: root/mkspecs
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2017-06-14 17:00:41 +0200
committerAlexandru Croitor <alexandru.croitor@qt.io>2017-06-16 15:24:10 +0000
commitdc5c46842b2336d45f6ce7279c9b094b78a8337b (patch)
tree62650992bc8497a60e526c76161f441b9dc329a4 /mkspecs
parentf6fab6e40a44b28bf908fb7e89d7c47dfb87bf43 (diff)
Remove duplicate LC_RPATH values on macOS
Starting with Qt 5.9, the values in QMAKE_RPATHDIR were passed along to GN, which resulted in both qmake and GN adding rpath linker flags, leading to duplicate rpath values. This lead to the Qt package installer not removing all absolute path rpath values when installing Qt, which subsequently caused issues with code signing Qt applications. The fix is not to pass the rpath values to GN, and rely on the ones generated by qmake. Task-number: QTBUG-61413 Change-Id: Ib27d9c232674534d4b053cb1e12750f5c8bc87a9 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'mkspecs')
-rw-r--r--mkspecs/features/gn_generator.prf3
1 files changed, 1 insertions, 2 deletions
diff --git a/mkspecs/features/gn_generator.prf b/mkspecs/features/gn_generator.prf
index 1f730acd..b2b74915 100644
--- a/mkspecs/features/gn_generator.prf
+++ b/mkspecs/features/gn_generator.prf
@@ -186,8 +186,7 @@ for (flag, QMAKE_LFLAGS): GN_CONTENTS += " \"$$filter_flag_values($$flag)\","
for (flag, GN_FLAGS): GN_CONTENTS += " \"$$flag\","
!isEmpty(QMAKE_RPATHDIR) {
for (rpath, QMAKE_RPATHDIR) {
- macos: GN_CONTENTS += " \"-Wl,-rpath,$${rpath}\","
- else:unix: GN_CONTENTS += " \"-Wl,-rpath=$${rpath}\","
+ unix:!macos: GN_CONTENTS += " \"-Wl,-rpath=$${rpath}\","
}
}
!isEmpty(QMAKE_RPATHLINKDIR): GN_CONTENTS += " \"-Wl,-rpath-link=$${QMAKE_RPATHLINKDIR}\","