diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-02-05 21:01:31 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-02-05 22:50:28 +0100 |
| commit | 04478614c1f21de8ff9abb7fe9dc64c672065695 (patch) | |
| tree | edbde441b082c506e7a48b1365342ac72914c67a | |
| parent | a1f4a821fc068958621c4d1aad5a366e77c46399 (diff) | |
fix transitive linking for x-builds
-rpath does *not* imply -rpath-link when x-building:
ld(1): "Searching -rpath in this way is only supported by native linkers
and cross linkers which have been configured with the --with-sysroot
option."
it doesn't hurt to have the "excess" -rpath-link for native builds, so
just remove the cleanup.
Change-Id: Ic39c1f4d6c2e3770d43a5ed3e56cf89a146edf85
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| -rw-r--r-- | mkspecs/features/qt_functions.prf | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf index 6fca19af57..b03e994b92 100644 --- a/mkspecs/features/qt_functions.prf +++ b/mkspecs/features/qt_functions.prf @@ -195,7 +195,6 @@ defineTest(qtAddRpathLink) { for(dep, privdep): \ rpaths += $$eval(QT.$${dep}.libs) QMAKE_RPATHLINKDIR *= $$unique(rpaths) - QMAKE_RPATHLINKDIR -= $$QMAKE_RPATHDIR # -rpath implies -rpath-link export(QMAKE_RPATHLINKDIR) } |