diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2016-06-22 11:29:37 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2016-06-22 11:29:46 +0200 |
| commit | 1f30d55c2c8879e3b561e4106a1c9d085140c642 (patch) | |
| tree | 8dc70bbf95ae8c34b3bb82ed2ebb805edf7f9d37 | |
| parent | 3aa92df53c975f99d055a0d66ee66acd3826067f (diff) | |
| parent | 50aa37bb0c78412225b77ce5221acd4cb90c8c0f (diff) | |
Merge remote-tracking branch 'origin/4.1'
Change-Id: Iff33cd1b9df24a449085d9dcfb7c41ad78517410
| -rw-r--r-- | 3rdparty/elfutils/libdw/libdw.qbs | 1 | ||||
| -rw-r--r-- | 3rdparty/elfutils/qbs/imports/DisHeader.qbs | 1 |
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 ]; |