summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@theqtcompany.com>2016-06-20 16:23:18 +0200
committerChristian Kandeler <christian.kandeler@theqtcompany.com>2016-06-21 12:54:21 +0000
commit50aa37bb0c78412225b77ce5221acd4cb90c8c0f (patch)
tree8dc70bbf95ae8c34b3bb82ed2ebb805edf7f9d37
parent3aa92df53c975f99d055a0d66ee66acd3826067f (diff)
Fix qbs build.
Change-Id: I06f2b5b3ffdb65e1bef2e2f3c71143ae984c046f Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
-rw-r--r--3rdparty/elfutils/libdw/libdw.qbs1
-rw-r--r--3rdparty/elfutils/qbs/imports/DisHeader.qbs1
2 files changed, 2 insertions, 0 deletions
diff --git a/3rdparty/elfutils/libdw/libdw.qbs b/3rdparty/elfutils/libdw/libdw.qbs
index 1ec0981..c61aab8 100644
--- a/3rdparty/elfutils/libdw/libdw.qbs
+++ b/3rdparty/elfutils/libdw/libdw.qbs
@@ -5,6 +5,7 @@ ElfUtilsDynamicLib {
Depends { name: "ebl" }
Depends { name: "dwfl" }
Depends { name: "elf" }
+ Depends { name: "dwelf" }
cpp.dynamicLibraries: base.concat(["dl", "z"])
// Workaround for broken dependencies
diff --git a/3rdparty/elfutils/qbs/imports/DisHeader.qbs b/3rdparty/elfutils/qbs/imports/DisHeader.qbs
index 9ceddfe..986de43 100644
--- a/3rdparty/elfutils/qbs/imports/DisHeader.qbs
+++ b/3rdparty/elfutils/qbs/imports/DisHeader.qbs
@@ -19,6 +19,7 @@ Product {
var args = [
"-f", FileInfo.joinPaths(product.sourceDirectory, "..", "extras.mk"),
"gendis=" + FileInfo.path(input.filePath),
+ "mnemonics=" + FileInfo.path(input.filePath),
"srcdir=" + FileInfo.joinPaths(product.sourceDirectory, ".."),
output.fileName
];