Set absolute_library_soname on mac only when not cross-compiling
authorSean Harmer <sean.harmer.qnx@kdab.com>
Mon, 12 Mar 2012 19:51:52 +0000 (19:51 +0000)
committerQt by Nokia <qt-info@nokia.com>
Thu, 22 Mar 2012 15:13:21 +0000 (16:13 +0100)
Change-Id: I24a2b70a515483d9d0990f66bff2b37df72faf17
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
configure

index 70979a3..32dd5f0 100755 (executable)
--- a/configure
+++ b/configure
@@ -5725,7 +5725,7 @@ fi
 [ '!' -z "$L_FLAGS" ] && QMakeVar add QMAKE_LIBDIR_FLAGS "$L_FLAGS"
 [ '!' -z "$l_FLAGS" ] && QMakeVar add LIBS "$l_FLAGS"
 
-if [ "$PLATFORM_MAC" = "yes" ]; then
+if [ "$PLATFORM_MAC" = "yes" ] && [ "$QT_CROSS_COMPILE" = "no" ]; then
     if [ "$CFG_RPATH" = "yes" ]; then
        QMAKE_CONFIG="$QMAKE_CONFIG absolute_library_soname"
        # set the default rpath to the library installation directory