From b4417527ca64975f15ae3c680c4c3416250e4a73 Mon Sep 17 00:00:00 2001 From: Ivan Donchevskii Date: Fri, 27 Apr 2018 08:19:32 +0200 Subject: 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 --- src/tools/clangbackend/clangbackend.pro | 5 ----- src/tools/clangpchmanagerbackend/clangpchmanagerbackend.pro | 6 ------ src/tools/clangrefactoringbackend/clangrefactoringbackend.pro | 5 ----- 3 files changed, 16 deletions(-) (limited to 'src/tools') 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}) -} -- cgit v1.2.3