diff options
author | Adam Strzelecki <ono@java.pl> | 2014-08-07 13:03:00 +0200 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-08-09 15:37:39 +0200 |
commit | 6545acdf68e5f845ee12112e4bc5ddd880c7480d (patch) | |
tree | 4e7b906a09503fda747f8df0b40cd18e46f0ee70 /mkspecs | |
parent | dbb0d5469982c57b29a474e6a940cdecbaf948e2 (diff) |
Enable rpath support on OS X and iOS platform
This is done by defining QMAKE_LFLAGS_RPATH for compilers for Apple platform.
Task-number: QTBUG-31814
Change-Id: I9040df341ad46395d6ab71bc760ba7a5ee5ff291
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
Diffstat (limited to 'mkspecs')
-rw-r--r-- | mkspecs/common/mac.conf | 2 | ||||
-rw-r--r-- | mkspecs/macx-icc/qmake.conf | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mkspecs/common/mac.conf b/mkspecs/common/mac.conf index 5f60549c70..91639ddb50 100644 --- a/mkspecs/common/mac.conf +++ b/mkspecs/common/mac.conf @@ -17,7 +17,7 @@ QMAKE_INCDIR_OPENGL = \ QMAKE_FIX_RPATH = install_name_tool -id -QMAKE_LFLAGS_RPATH = +QMAKE_LFLAGS_RPATH = -Wl,-rpath, QMAKE_LFLAGS_GCSECTIONS = -Wl,-dead_strip QMAKE_LIBS_DYNLOAD = diff --git a/mkspecs/macx-icc/qmake.conf b/mkspecs/macx-icc/qmake.conf index 88b04976f2..521e64e364 100644 --- a/mkspecs/macx-icc/qmake.conf +++ b/mkspecs/macx-icc/qmake.conf @@ -67,7 +67,7 @@ QMAKE_LFLAGS_INCREMENTAL = -undefined suppress -flat_namespace QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB QMAKE_LFLAGS_SONAME = -install_name$${LITERAL_WHITESPACE} QMAKE_LFLAGS_THREAD = -QMAKE_LFLAGS_RPATH = +QMAKE_LFLAGS_RPATH = -Wl,-rpath, QMAKE_LFLAGS_LTCG = $$QMAKE_CFLAGS_LTCG QMAKE_LFLAGS_VERSION = -current_version$${LITERAL_WHITESPACE} |