From 5dc421ec87eca15a72c82203319a9be7655cd56a Mon Sep 17 00:00:00 2001 From: Andy Shaw Date: Fri, 8 Apr 2016 09:10:08 +0200 Subject: 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 --- mkspecs/features/lex.prf | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'mkspecs/features/lex.prf') 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 option is active -- cgit v1.2.3