From 04478614c1f21de8ff9abb7fe9dc64c672065695 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Tue, 5 Feb 2013 21:01:31 +0100 Subject: 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 --- mkspecs/features/qt_functions.prf | 1 - 1 file changed, 1 deletion(-) 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) } -- cgit v1.2.3