diff options
| author | Adam Majer <adamm@zombino.com> | 2015-09-27 18:02:38 -0500 |
|---|---|---|
| committer | Adam Majer <adamm@zombino.com> | 2015-10-23 01:52:23 +0000 |
| commit | e8d0f36faac6067ed8b6b5429f29411a1cb9c70d (patch) | |
| tree | 56643e01d7b12bf55117a4f4f58f2397c3dfe5f7 | |
| parent | b4c52505ca7333d9c013264b0496ff533d75ffe8 (diff) | |
| download | qt-creator-3.5.tar.gz | |
Do not embed rpath to external libraries3.5
Some distributions, like Debian, generally do not permit rpath to be
set. Add a configure option that disables rpath inclusion to external
libraries.
Change-Id: Ieb1b16d3a154fdf9da09902dc8a27dd1be0a530e
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
| -rw-r--r-- | src/plugins/clangcodemodel/clangcodemodel.pro | 4 | ||||
| -rw-r--r-- | src/tools/clangbackend/clangbackend.pro | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/plugins/clangcodemodel/clangcodemodel.pro b/src/plugins/clangcodemodel/clangcodemodel.pro index b4758730d8..38d7f7dd0f 100644 --- a/src/plugins/clangcodemodel/clangcodemodel.pro +++ b/src/plugins/clangcodemodel/clangcodemodel.pro @@ -9,7 +9,9 @@ DEFINES += CLANGCODEMODEL_LIBRARY DEFINES += CLANG_VERSION=\\\"$${LLVM_VERSION}\\\" DEFINES += "\"CLANG_RESOURCE_DIR=\\\"$${LLVM_LIBDIR}/clang/$${LLVM_VERSION}/include\\\"\"" -unix:QMAKE_LFLAGS += -Wl,-rpath,\'$$LLVM_LIBDIR\' +unix { + !disable_external_rpath: QMAKE_LFLAGS += -Wl,-rpath,\'$$LLVM_LIBDIR\' +} SOURCES += \ activationsequencecontextprocessor.cpp \ diff --git a/src/tools/clangbackend/clangbackend.pro b/src/tools/clangbackend/clangbackend.pro index 452eb8dbde..c3210fedbf 100644 --- a/src/tools/clangbackend/clangbackend.pro +++ b/src/tools/clangbackend/clangbackend.pro @@ -16,5 +16,5 @@ SOURCES += clangbackendmain.cpp unix { !osx: QMAKE_LFLAGS += -Wl,-z,origin - QMAKE_LFLAGS += -Wl,-rpath,$$shell_quote($${LLVM_LIBDIR}) + !disable_external_rpath: QMAKE_LFLAGS += -Wl,-rpath,$$shell_quote($${LLVM_LIBDIR}) } |