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

Clang: Move 'disable_external_rpath' to clang_installation.pri

Browse Source 
It should be required for every project part which
depends on LLVM.

Change-Id: I8d645661dfa4fc4858bb40e156671a0ecf0bdbe3
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Ivan Donchevskii
2018-04-27 08:19:32 +02:00
parent 67c775afd6
commit b4417527ca
4 changed files with 5 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/shared/clang/clang_installation.pri
View File

@@ -172,4 +172,9 @@ isEmpty(LLVM_VERSION) {
LLVM_CXXFLAGS ~= s,-gsplit-dwarf, LLVM_CXXFLAGS ~= s,-gsplit-dwarf,
LLVM_IS_COMPILED_WITH_RTTI = $$system($$llvm_config --has-rtti, lines) LLVM_IS_COMPILED_WITH_RTTI = $$system($$llvm_config --has-rtti, lines)
unix:!disable_external_rpath:!contains(QMAKE_DEFAULT_LIBDIRS, $${LLVM_LIBDIR}) {
!macos: QMAKE_LFLAGS += -Wl,-z,origin
QMAKE_LFLAGS += -Wl,-rpath,$$shell_quote($${LLVM_LIBDIR})
}
} }

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

@@ -18,8 +18,3 @@ SOURCES += clangbackendmain.cpp
HEADERS += ../qtcreatorcrashhandler/crashhandlersetup.h HEADERS += ../qtcreatorcrashhandler/crashhandlersetup.h
SOURCES += ../qtcreatorcrashhandler/crashhandlersetup.cpp SOURCES += ../qtcreatorcrashhandler/crashhandlersetup.cpp
unix:!disable_external_rpath:!contains(QMAKE_DEFAULT_LIBDIRS, $${LLVM_LIBDIR}) {
!osx: QMAKE_LFLAGS += -Wl,-z,origin
QMAKE_LFLAGS += -Wl,-rpath,$$shell_quote($${LLVM_LIBDIR})
}

6
src/tools/clangpchmanagerbackend/clangpchmanagerbackend.pro
View File

@@ -27,10 +27,4 @@ SOURCES += \
../clangrefactoringbackend/source/clangtool.cpp \ ../clangrefactoringbackend/source/clangtool.cpp \
../clangrefactoringbackend/source/refactoringcompilationdatabase.cpp ../clangrefactoringbackend/source/refactoringcompilationdatabase.cpp
unix:!disable_external_rpath:!contains(QMAKE_DEFAULT_LIBDIRS, $${LLVM_LIBDIR}) {
!macx: QMAKE_LFLAGS += -Wl,-z,origin
QMAKE_LFLAGS += -Wl,-rpath,$$shell_quote($${LLVM_LIBDIR})
}
DEFINES += CLANG_COMPILER_PATH=\"R\\\"xxx($${LLVM_BINDIR}/clang)xxx\\\"\" DEFINES += CLANG_COMPILER_PATH=\"R\\\"xxx($${LLVM_BINDIR}/clang)xxx\\\"\"

5
src/tools/clangrefactoringbackend/clangrefactoringbackend.pro
View File

@@ -22,8 +22,3 @@ QMAKE_CXXFLAGS += $$LLVM_CXXFLAGS
SOURCES += \ SOURCES += \
clangrefactoringbackendmain.cpp clangrefactoringbackendmain.cpp
unix:!disable_external_rpath:!contains(QMAKE_DEFAULT_LIBDIRS, $$LLVM_LIBDIR) {
!osx: QMAKE_LFLAGS += -Wl,-z,origin
QMAKE_LFLAGS += -Wl,-rpath,$$shell_quote($${LLVM_LIBDIR})
}