aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Hans Peter Freyther <zecke@selfish.org>2010-09-27 00:43:53 +0800
committerHolger Hans Peter Freyther <zecke@selfish.org>2010-09-27 01:17:22 +0800
commit39bc8dd56b618db9c09f57a775fc4250500c761f (patch)
treee8acc498426a97961ccd7b4cbd26084f1f4baad1
parenta0dd0010fcc10d83f0e181b62ed1049fcb0273b2 (diff)
downloadopenembedded-39bc8dd56b618db9c09f57a775fc4250500c761f.tar.gz
openembedded-39bc8dd56b618db9c09f57a775fc4250500c761f.tar.bz2
openembedded-39bc8dd56b618db9c09f57a775fc4250500c761f.zip
qt-4.7.0: Use qmake feature to link with -rpath-link.
This is instructing qmake to use the QMAKE_LFLAGS_RPATH for the lib directory in the build tree. It should be safe to use even for software using the resulting qmake.
-rw-r--r--recipes/qt4/qt-4.7.0/g++.conf3
1 files changed, 3 insertions, 0 deletions
diff --git a/recipes/qt4/qt-4.7.0/g++.conf b/recipes/qt4/qt-4.7.0/g++.conf
index 266a69f720..80f925cc5e 100644
--- a/recipes/qt4/qt-4.7.0/g++.conf
+++ b/recipes/qt4/qt-4.7.0/g++.conf
@@ -53,5 +53,8 @@ QMAKE_PCH_OUTPUT_EXT = .gch
QMAKE_LFLAGS_BSYMBOLIC_FUNC = -Wl,-Bsymbolic-functions
QMAKE_LFLAGS_DYNAMIC_LIST = -Wl,--dynamic-list,
+# some linking helper...
+CONFIG += rpath_libdirs
+
# for the SDK
isEmpty(QMAKE_QT_CONFIG):QMAKE_QT_CONFIG = $(OE_QMAKE_QT_CONFIG)