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

fix llvm libdir handling wrt RPATH, more or less properly

Browse Source 
we must not add the llvm libdir if it's a system path. this was already
done in some places, but not in others.

while we're at it, re-shuffle some pre-existing conditionals to make
things consistent.

Task-number: QTCREATORBUG-20178
Change-Id: Ib7e5a81705494e4cf2f83a4782ecd0832b91e511
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
This commit is contained in:
Oswald Buddenhagen
2018-04-05 15:30:06 +02:00
parent 51cc3957b4
commit bb027e10a8
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@@ -28,9 +28,9 @@ SOURCES += \
../clangrefactoringbackend/source/refactoringcompilationdatabase.cpp ../clangrefactoringbackend/source/refactoringcompilationdatabase.cpp
unix { unix:!disable_external_rpath:!contains(QMAKE_DEFAULT_LIBDIRS, $${LLVM_LIBDIR}) {
!macx: QMAKE_LFLAGS += -Wl,-z,origin !macx: QMAKE_LFLAGS += -Wl,-z,origin
!disable_external_rpath: QMAKE_LFLAGS += -Wl,-rpath,$$shell_quote($${LLVM_LIBDIR}) 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\\\"\"

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

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

2
tests/unit/unittest/clang_dependency.pri
View File

@@ -17,7 +17,7 @@ include(../../../src/shared/clang/clang_installation.pri)
} }
LIBS += $$LIBTOOLING_LIBS $$LIBCLANG_LIBS LIBS += $$LIBTOOLING_LIBS $$LIBCLANG_LIBS
QMAKE_RPATHDIR += $$LLVM_LIBDIR !contains(QMAKE_DEFAULT_LIBDIRS, $$LLVM_LIBDIR): QMAKE_RPATHDIR += $$LLVM_LIBDIR
LLVM_CXXFLAGS ~= s,-g\d?, LLVM_CXXFLAGS ~= s,-g\d?,
QMAKE_CXXFLAGS += $$LLVM_CXXFLAGS QMAKE_CXXFLAGS += $$LLVM_CXXFLAGS