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

Don't automatically deploy elfutils with perfparser

Browse Source 
When building with system elfutils, this is not a good idea. You can
always set the variables explicitly to enable this.

Change-Id: Icecf3949ecb561dde0889ca38ac36a900996102e
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
Ulf Hermann
2018-12-20 15:37:03 +01:00
parent 3741c2213d
commit d729253718
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/tools/tools.pro
View File

@@ -60,24 +60,24 @@ exists(perfparser/perfparser.pro) {
PERFPARSER_APP_INSTALLDIR = $$QTC_PREFIX/bin PERFPARSER_APP_INSTALLDIR = $$QTC_PREFIX/bin
# On windows we take advantage of the fixed path in eblopenbackend.c: "..\lib\elfutils\" # On windows we take advantage of the fixed path in eblopenbackend.c: "..\lib\elfutils\"
PERFPARSER_ELFUTILS_INSTALLDIR = $$QTC_PREFIX/bin # So, in order to deploy elfutils with perfparser, set the following:
PERFPARSER_ELFUTILS_BACKENDS_INSTALLDIR = $$QTC_PREFIX/lib/elfutils # PERFPARSER_ELFUTILS_INSTALLDIR = $$QTC_PREFIX/bin
# PERFPARSER_ELFUTILS_BACKENDS_INSTALLDIR = $$QTC_PREFIX/lib/elfutils
} else { } else {
SUBDIRS += perfparser SUBDIRS += perfparser
PERFPARSER_APP_DESTDIR = $$IDE_BUILD_TREE/libexec/qtcreator PERFPARSER_APP_DESTDIR = $$IDE_BUILD_TREE/libexec/qtcreator
PERFPARSER_APP_INSTALLDIR = $$QTC_PREFIX/libexec/qtcreator PERFPARSER_APP_INSTALLDIR = $$QTC_PREFIX/libexec/qtcreator
# On linux we have "$ORIGIN/../$LIB/elfutils" in eblopenbackend.c. Unfortunately $LIB can # On linux we have "$ORIGIN/../$LIB/elfutils" in eblopenbackend.c. Unfortunately $LIB
# be many different things, so we target the second try where it just loads the plain file # can be many different things, so we target the second try where it just loads the
# name. This also allows us to put libdw and libelf in a subdir of lib. # plain file name. This also allows us to put libdw and libelf in a subdir of lib.
PERFPARSER_ELFUTILS_INSTALLDIR = $$QTC_PREFIX/lib/elfutils # So, in order to deploy elfutils with perfparser, set the following:
PERFPARSER_ELFUTILS_BACKENDS_INSTALLDIR = $$QTC_PREFIX/lib/elfutils # PERFPARSER_ELFUTILS_INSTALLDIR = $$QTC_PREFIX/lib/elfutils
# PERFPARSER_ELFUTILS_BACKENDS_INSTALLDIR = $$QTC_PREFIX/lib/elfutils
} }
cache(PERFPARSER_APP_DESTDIR) cache(PERFPARSER_APP_DESTDIR)
cache(PERFPARSER_APP_INSTALLDIR) cache(PERFPARSER_APP_INSTALLDIR)
cache(PERFPARSER_ELFUTILS_INSTALLDIR)
cache(PERFPARSER_ELFUTILS_BACKENDS_INSTALLDIR)
} }
OTHER_FILES += tools.qbs OTHER_FILES += tools.qbs