forked from qt-creator/qt-creator
Clang: Move 'disable_external_rpath' to clang_installation.pri
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:
@@ -172,4 +172,9 @@ isEmpty(LLVM_VERSION) {
|
||||
LLVM_CXXFLAGS ~= s,-gsplit-dwarf,
|
||||
|
||||
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})
|
||||
}
|
||||
}
|
||||
|
@@ -18,8 +18,3 @@ SOURCES += clangbackendmain.cpp
|
||||
|
||||
HEADERS += ../qtcreatorcrashhandler/crashhandlersetup.h
|
||||
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})
|
||||
}
|
||||
|
@@ -27,10 +27,4 @@ SOURCES += \
|
||||
../clangrefactoringbackend/source/clangtool.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\\\"\"
|
||||
|
@@ -22,8 +22,3 @@ QMAKE_CXXFLAGS += $$LLVM_CXXFLAGS
|
||||
|
||||
SOURCES += \
|
||||
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})
|
||||
}
|
||||
|
Reference in New Issue
Block a user