diff options
4 files changed, 5 insertions, 16 deletions
diff --git a/src/shared/clang/clang_installation.pri b/src/shared/clang/clang_installation.pri index a41c118ebd..34132a6b53 100644 --- a/src/shared/clang/clang_installation.pri +++ b/src/shared/clang/clang_installation.pri @@ -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}) + } } diff --git a/src/tools/clangbackend/clangbackend.pro b/src/tools/clangbackend/clangbackend.pro index c1c72036ea..d2439f8fef 100644 --- a/src/tools/clangbackend/clangbackend.pro +++ b/src/tools/clangbackend/clangbackend.pro @@ -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}) -} diff --git a/src/tools/clangpchmanagerbackend/clangpchmanagerbackend.pro b/src/tools/clangpchmanagerbackend/clangpchmanagerbackend.pro index efdd94377b..dd2592e5ac 100644 --- a/src/tools/clangpchmanagerbackend/clangpchmanagerbackend.pro +++ b/src/tools/clangpchmanagerbackend/clangpchmanagerbackend.pro @@ -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\\\"\" diff --git a/src/tools/clangrefactoringbackend/clangrefactoringbackend.pro b/src/tools/clangrefactoringbackend/clangrefactoringbackend.pro index 6e7c8262a9..072d254728 100644 --- a/src/tools/clangrefactoringbackend/clangrefactoringbackend.pro +++ b/src/tools/clangrefactoringbackend/clangrefactoringbackend.pro @@ -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}) -} |