diff options
| author | Morten Johan Sorvig <morten.sorvig@nokia.com> | 2012-02-17 14:34:25 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-20 09:42:04 +0100 |
| commit | 5af7e089f79174e576529a742c380cf418510771 (patch) | |
| tree | 54e0651481446d16aecfdecee1c0500f969c8a8f /configure | |
| parent | 7d8f5777bede600d60ceb9be1213c71fd93c3ed7 (diff) | |
Don't use -rpath-link when building on Mac.
The logic here was wrong: test if the
target linker supports -rpath-link, and then set
it for both host and target via mkspecs/qmodule.pri.
Change-Id: Ie4da7ed2e06e784f9edb65a27290913ab838a8c2
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -7355,7 +7355,7 @@ QTMODULE="$outpath/mkspecs/qmodule.pri" echo "CONFIG += create_prl link_prl" >> "$QTMODULE.tmp" # Ensure we can link to uninistalled libraries -if [ "$XPLATFORM_MINGW" != "yes" ] && [ "$CFG_EMBEDDED" != "nacl" ] && linkerSupportsFlag -rpath-link "$outpath/lib"; then +if [ "$BUILD_ON_MAC" != "yes" ] && [ "$XPLATFORM_MINGW" != "yes" ] && linkerSupportsFlag -rpath-link "$outpath/lib"; then echo "QMAKE_LFLAGS = -Wl,-rpath-link,\$\$QT_BUILD_TREE/lib \$\$QMAKE_LFLAGS" >> "$QTMODULE.tmp" fi if [ -n "$QT_CFLAGS_PSQL" ]; then |