aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@theqtcompany.com>2015-05-22 16:30:27 +0200
committerJoerg Bornemann <joerg.bornemann@theqtcompany.com>2015-05-22 17:06:57 +0000
commita63abca242088552edb6598364cbc3fca9bfc594 (patch)
tree68efeb764f175383c740c4fab824dd5176b86193
parentb6f90c5164b7baf90befd489e3eab971245a126e (diff)
OS X: fix qbs_disable_rpath build
Task-number: QBS-786 Change-Id: Ie38a22e008c408fdcb0c78df2d6a15fda6899f43 Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
-rw-r--r--src/lib/library.pri6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/lib/library.pri b/src/lib/library.pri
index 43550a68c..e6b79f63e 100644
--- a/src/lib/library.pri
+++ b/src/lib/library.pri
@@ -18,8 +18,10 @@ contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
win32:CONFIG(debug, debug|release):TARGET = $${TARGET}d
CONFIG += c++11
-!qbs_disable_rpath {
- macx:QMAKE_LFLAGS_SONAME = -Wl,-install_name,@rpath/
+qbs_disable_rpath {
+ osx:QMAKE_LFLAGS_SONAME = -Wl,-install_name,$$QBS_INSTALL_PREFIX/$$QBS_LIBRARY_DIRNAME/
+} else {
+ osx:QMAKE_LFLAGS_SONAME = -Wl,-install_name,@rpath/
}
include(../../qbs_version.pri)
VERSION = $${QBS_VERSION}