summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2016-03-03 20:59:18 +0100
committerOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2016-03-16 15:07:43 +0000
commitc27d4eeac6dcd48b89c3deff1110da6bd0ab6476 (patch)
tree04c942436757affa25d779cfc9f156e181ec4779
parent523c7e3fd55c853dd424d57f28e225d57439cf89 (diff)
don't force our runpath upon user projects anymore
now that we rely on consistently sane runpath semantics everywhere (--enable-new-dtags on linux; the default elsewhere), there is no use in forcing our runpath downstream: our libraries will find their dependencies due to their embedded runpath. this does not affect qt.prf adding qt's own library path to the user projects' runpath. this effectively reverts 42a7eb8df6, and some more. Change-Id: If7af7be7b7a894bebb9b146ccb0035452223c7ac Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
-rwxr-xr-xconfigure3
1 files changed, 0 insertions, 3 deletions
diff --git a/configure b/configure
index f247401c53..7feed4c9e8 100755
--- a/configure
+++ b/configure
@@ -7048,9 +7048,6 @@ if [ -n "$CFG_SYSROOT" ] && [ "$CFG_GCC_SYSROOT" = "yes" ]; then
echo "}"
echo
fi
-if [ -n "$RPATH_FLAGS" ]; then
- echo "QMAKE_RPATHDIR += $RPATH_FLAGS"
-fi
echo "QT_COMPILER_STDCXX = $CFG_STDCXX_DEFAULT"
if [ -n "$QT_GCC_MAJOR_VERSION" ]; then
echo "QT_GCC_MAJOR_VERSION = $QT_GCC_MAJOR_VERSION"