feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Do not embed rpath to external libraries

Browse Source 
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>
This commit is contained in:
Adam Majer
2015-09-27 18:02:38 -05:00
parent b4c52505ca
commit e8d0f36faa
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/clangcodemodel/clangcodemodel.pro
View File

@@ -9,7 +9,9 @@ DEFINES += CLANGCODEMODEL_LIBRARY
DEFINES += CLANG_VERSION=\\\"$${LLVM_VERSION}\\\" DEFINES += CLANG_VERSION=\\\"$${LLVM_VERSION}\\\"
DEFINES += "\"CLANG_RESOURCE_DIR=\\\"$${LLVM_LIBDIR}/clang/$${LLVM_VERSION}/include\\\"\"" 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 += \ SOURCES += \
activationsequencecontextprocessor.cpp \ activationsequencecontextprocessor.cpp \

2
src/tools/clangbackend/clangbackend.pro
View File

@@ -16,5 +16,5 @@ SOURCES += clangbackendmain.cpp
unix { unix {
!osx: QMAKE_LFLAGS += -Wl,-z,origin !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})
} }