summaryrefslogtreecommitdiffstats
path: root/src/angle
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@qt.io>2017-01-05 12:39:56 +0100
committerJoerg Bornemann <joerg.bornemann@qt.io>2017-01-16 15:20:27 +0000
commitf225a459a0555eed6f2a2eac6509173d9f5207a1 (patch)
tree71ca98a08144a74ea254e6504cd595141b8ecd9d /src/angle
parentca7f67e82b380e1b45a29cb2d2982bfe5e773d4a (diff)
Fix unneeded recompiles of glslang_tab.cpp
To work around qmake deficiencies src/angle/src/compiler/translator.pro contains a no-op extra compiler that "creates" glslang_tab.cpp and adds a dependency to glslang_tab.h. However, both files are created in one bison call, and for some reason the .cpp file is created before the .h file. Then the dependency glslang_tab.cpp -> glslang_tab.h results in recompiling glslang_tab.cpp on every incremental build. Ensure that glslang_tab.cpp is newer than glslang_tab.h. Change-Id: I6f59e213c84af85c59c02d90ac220bd347faddd1 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'src/angle')
-rw-r--r--src/angle/src/compiler/translator.pro3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/angle/src/compiler/translator.pro b/src/angle/src/compiler/translator.pro
index 663a8892a7..398b9230cc 100644
--- a/src/angle/src/compiler/translator.pro
+++ b/src/angle/src/compiler/translator.pro
@@ -189,7 +189,8 @@ QMAKE_EXTRA_COMPILERS += flex
defineReplace(myDirName) { return($$dirname(1)) }
bison.commands = $$addGnuPath(bison) --no-lines --skeleton=yacc.c --defines=${QMAKE_FILE_OUT} \
--output=${QMAKE_FUNC_FILE_OUT_myDirName}$$QMAKE_DIR_SEP${QMAKE_FILE_OUT_BASE}.cpp \
- ${QMAKE_FILE_NAME}
+ ${QMAKE_FILE_NAME}$$escape_expand(\\n\\t) \
+ @echo // EOF>>${QMAKE_FUNC_FILE_OUT_myDirName}$$QMAKE_DIR_SEP${QMAKE_FILE_OUT_BASE}.cpp
bison.output = $${BUILDSUBDIR}${QMAKE_FILE_BASE}_tab.h
bison.input = BISON_SOURCES
bison.dependency_type = TYPE_C