aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@theqtcompany.com>2014-10-20 15:24:47 +0200
committerKai Koehne <kai.koehne@theqtcompany.com>2015-04-01 10:02:53 +0000
commitcc8b455d00dfa30a6c4ddc98ffd8a275c36159b9 (patch)
treeb556977dfddf4427b64a56952f5da3379a485b2f
parent22b7fd1c0b93f12585858ac5baabba32408749fd (diff)
Avoid parallel reading/writing of RegExpJitTables.h
RegExpJitTables.h is created in the build directory at compilation time. This creates problems if debug and release targets are built in parallel: They might overwrite each other's results, letting the compiler see intermediate content. Avoid this by using separate directories for the debug and release build. Change-Id: I54fee7cb727a1c1777af8e0d5d19a71fdc3aac68 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
-rw-r--r--src/3rdparty/masm/masm.pri15
1 files changed, 14 insertions, 1 deletions
diff --git a/src/3rdparty/masm/masm.pri b/src/3rdparty/masm/masm.pri
index 3655af36b6..3497650f0c 100644
--- a/src/3rdparty/masm/masm.pri
+++ b/src/3rdparty/masm/masm.pri
@@ -63,7 +63,20 @@ HEADERS += $$PWD/disassembler/ARMv7/ARMv7DOpcode.h
SOURCES += $$PWD/yarr/*.cpp
HEADERS += $$PWD/yarr/*.h
-retgen.output = RegExpJitTables.h
+#
+# Generate RegExpJitTables.h
+#
+GENERATEDDIR = .generated
+debug_and_release {
+ CONFIG(debug, debug|release) {
+ GENERATEDDIR = $$GENERATEDDIR/debug
+ } else {
+ GENERATEDDIR = $$GENERATEDDIR/release
+ }
+}
+INCLUDEPATH += $$GENERATEDDIR
+
+retgen.output = $$GENERATEDDIR/RegExpJitTables.h
retgen.script = $$PWD/create_regex_tables
retgen.input = retgen.script
retgen.CONFIG += no_link