summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@qt.io>2017-03-10 14:02:25 +0100
committerChristian Kandeler <christian.kandeler@qt.io>2017-03-13 10:49:22 +0000
commited50aa2ed4959469be87332792eccb6642b9e182 (patch)
tree6ad03ce03b0fc87fadacee79fa1c6a258316bb1b
parentac46eba3a6102c0883f43a3ebfe337a99fd4dc86 (diff)
qbs build: Fix race condition when building elfutils
Change-Id: Ic838d60269159f792f38e87322e84ab3c1be886d Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
-rw-r--r--3rdparty/elfutils/qbs/imports/Disasm.qbs21
1 files changed, 21 insertions, 0 deletions
diff --git a/3rdparty/elfutils/qbs/imports/Disasm.qbs b/3rdparty/elfutils/qbs/imports/Disasm.qbs
index 838f8cc..a4e8bb7 100644
--- a/3rdparty/elfutils/qbs/imports/Disasm.qbs
+++ b/3rdparty/elfutils/qbs/imports/Disasm.qbs
@@ -1,5 +1,6 @@
import qbs
import qbs.FileInfo
+import qbs.TextFile
ElfUtilsStaticLib {
property string arch
@@ -7,6 +8,26 @@ ElfUtilsStaticLib {
name: arch + " disasm"
Depends { name: arch + " disasm header" }
Depends { name: arch + " mnemonics" }
+
+ // FIXME: QBS-1113
+ Rule {
+ multiplex: true
+ inputsFromDependencies: ["hpp", "mnemonics"]
+ Artifact {
+ filePath: "dummy.h"
+ fileTags: ["hpp"]
+ }
+ prepare: {
+ var cmd = new JavaScriptCommand();
+ cmd.silent = true;
+ cmd.sourceCode = function() {
+ var f = new TextFile(output.filePath, TextFile.WriteOnly);
+ f.close();
+ }
+ return [cmd];
+ }
+ }
+
cpp.includePaths: base.concat([FileInfo.joinPaths(product.sourceDirectory, "..")])
files: [FileInfo.joinPaths(sourceDirectory, "..", arch + "_disasm.c")]
}