summaryrefslogtreecommitdiffstats
path: root/mkspecs/features
diff options
context:
space:
mode:
authorAndy Shaw <andy.shaw@theqtcompany.com>2016-04-08 09:10:08 +0200
committerAndy Shaw <andy.shaw@theqtcompany.com>2016-05-10 13:16:37 +0000
commit5dc421ec87eca15a72c82203319a9be7655cd56a (patch)
tree13a69395ca68ee34b9e81385bd8e9ae1039e3f41 /mkspecs/features
parent4e0b76d810fe370f6a5c6e0242c487f026e809d3 (diff)
Restore the missing -P option for lex handling
We don't know why it works, but we've been told that it fixes some builds and we have no reason to think it will break others. Task-number: QTBUG-52998 Change-Id: Iacaa1fb3c49e4d7aafd4167e591ff3724489872e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'mkspecs/features')
-rw-r--r--mkspecs/features/lex.prf6
1 files changed, 5 insertions, 1 deletions
diff --git a/mkspecs/features/lex.prf b/mkspecs/features/lex.prf
index 1ca9ae8afa..16d3a6aa94 100644
--- a/mkspecs/features/lex.prf
+++ b/mkspecs/features/lex.prf
@@ -11,9 +11,13 @@
lex.variable_out = GENERATED_SOURCES
}
+ isEmpty(QMAKE_LEXFLAGS_MANGLE):QMAKE_LEXFLAGS_MANGLE = -P${QMAKE_FILE_BASE}
+ QMAKE_LEXEXTRAFLAGS = $$QMAKE_LEXFLAGS
+ !yacc_no_name_mangle:QMAKE_LEXEXTRAFLAGS += $$QMAKE_LEXFLAGS_MANGLE
+
contains(QMAKE_LEX, .*flex) {
# GNU flex, we can use -o outfile
- lex.commands = $$QMAKE_LEX $$QMAKE_LEXFLAGS --nounistd -o ${QMAKE_FILE_OUT} ${QMAKE_FILE_IN}
+ lex.commands = $$QMAKE_LEX $$QMAKE_LEXEXTRAFLAGS --nounistd -o ${QMAKE_FILE_OUT} ${QMAKE_FILE_IN}
} else {
# stupid POSIX lex, it only generates a file called lex.yy.c
# or lex.prefix.c if the -P<prefix> option is active