From d729253718651eed4f3e1c1518e373be9482de2b Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Thu, 20 Dec 2018 15:37:03 +0100 Subject: [PATCH] Don't automatically deploy elfutils with perfparser 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 --- src/tools/tools.pro | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/tools/tools.pro b/src/tools/tools.pro index 558e8eb9ee4..07cc2c2114a 100644 --- a/src/tools/tools.pro +++ b/src/tools/tools.pro @@ -60,24 +60,24 @@ exists(perfparser/perfparser.pro) { PERFPARSER_APP_INSTALLDIR = $$QTC_PREFIX/bin # On windows we take advantage of the fixed path in eblopenbackend.c: "..\lib\elfutils\" - PERFPARSER_ELFUTILS_INSTALLDIR = $$QTC_PREFIX/bin - PERFPARSER_ELFUTILS_BACKENDS_INSTALLDIR = $$QTC_PREFIX/lib/elfutils + # So, in order to deploy elfutils with perfparser, set the following: + # PERFPARSER_ELFUTILS_INSTALLDIR = $$QTC_PREFIX/bin + # PERFPARSER_ELFUTILS_BACKENDS_INSTALLDIR = $$QTC_PREFIX/lib/elfutils } else { SUBDIRS += perfparser PERFPARSER_APP_DESTDIR = $$IDE_BUILD_TREE/libexec/qtcreator PERFPARSER_APP_INSTALLDIR = $$QTC_PREFIX/libexec/qtcreator - # On linux we have "$ORIGIN/../$LIB/elfutils" in eblopenbackend.c. Unfortunately $LIB can - # be many different things, so we target the second try where it just loads the plain file - # name. This also allows us to put libdw and libelf in a subdir of lib. - PERFPARSER_ELFUTILS_INSTALLDIR = $$QTC_PREFIX/lib/elfutils - PERFPARSER_ELFUTILS_BACKENDS_INSTALLDIR = $$QTC_PREFIX/lib/elfutils + # On linux we have "$ORIGIN/../$LIB/elfutils" in eblopenbackend.c. Unfortunately $LIB + # can be many different things, so we target the second try where it just loads the + # plain file name. This also allows us to put libdw and libelf in a subdir of lib. + # So, in order to deploy elfutils with perfparser, set the following: + # PERFPARSER_ELFUTILS_INSTALLDIR = $$QTC_PREFIX/lib/elfutils + # PERFPARSER_ELFUTILS_BACKENDS_INSTALLDIR = $$QTC_PREFIX/lib/elfutils } cache(PERFPARSER_APP_DESTDIR) cache(PERFPARSER_APP_INSTALLDIR) - cache(PERFPARSER_ELFUTILS_INSTALLDIR) - cache(PERFPARSER_ELFUTILS_BACKENDS_INSTALLDIR) } OTHER_FILES += tools.qbs