Makes sure that yacc works with the MSYS bison on Windows.
Most people's yacc are actually a symlink to bison. On Windows, where symlinks don't usually exist, we can use bison -y. This was tested with MSYS Bison. Change-Id: I913745d48af30f9ef7b846b6438500261dd6022d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
This commit is contained in:
parent
db2fc7843c
commit
6636320867
@ -23,7 +23,7 @@ contains(QMAKE_TARGET.arch, x86_64) {
|
|||||||
QMAKE_CC = cl
|
QMAKE_CC = cl
|
||||||
QMAKE_LEX = flex
|
QMAKE_LEX = flex
|
||||||
QMAKE_LEXFLAGS =
|
QMAKE_LEXFLAGS =
|
||||||
QMAKE_YACC = byacc
|
QMAKE_YACC = bison -y
|
||||||
QMAKE_YACCFLAGS = -d
|
QMAKE_YACCFLAGS = -d
|
||||||
QMAKE_CFLAGS = -nologo -Zc:wchar_t
|
QMAKE_CFLAGS = -nologo -Zc:wchar_t
|
||||||
QMAKE_CFLAGS_WARN_ON = -W3
|
QMAKE_CFLAGS_WARN_ON = -W3
|
||||||
|
@ -15,7 +15,7 @@ QMAKE_COMPILER = msvc
|
|||||||
QMAKE_CC = cl
|
QMAKE_CC = cl
|
||||||
QMAKE_LEX = flex
|
QMAKE_LEX = flex
|
||||||
QMAKE_LEXFLAGS =
|
QMAKE_LEXFLAGS =
|
||||||
QMAKE_YACC = byacc
|
QMAKE_YACC = bison -y
|
||||||
QMAKE_YACCFLAGS = -d
|
QMAKE_YACCFLAGS = -d
|
||||||
QMAKE_CFLAGS = -nologo -Zm200 -Zc:wchar_t-
|
QMAKE_CFLAGS = -nologo -Zm200 -Zc:wchar_t-
|
||||||
QMAKE_CFLAGS_WARN_ON = -W3
|
QMAKE_CFLAGS_WARN_ON = -W3
|
||||||
|
@ -16,7 +16,7 @@ DEPLOYMENT_PLUGIN += qwinrt
|
|||||||
QMAKE_CC = cl
|
QMAKE_CC = cl
|
||||||
QMAKE_LEX = flex
|
QMAKE_LEX = flex
|
||||||
QMAKE_LEXFLAGS =
|
QMAKE_LEXFLAGS =
|
||||||
QMAKE_YACC = byacc
|
QMAKE_YACC = bison -y
|
||||||
QMAKE_YACCFLAGS = -d
|
QMAKE_YACCFLAGS = -d
|
||||||
QMAKE_CFLAGS = -nologo
|
QMAKE_CFLAGS = -nologo
|
||||||
QMAKE_CFLAGS_WARN_ON = -W3
|
QMAKE_CFLAGS_WARN_ON = -W3
|
||||||
|
@ -14,7 +14,7 @@ QMAKE_COMPILER = gcc
|
|||||||
QMAKE_CC = gcc
|
QMAKE_CC = gcc
|
||||||
QMAKE_LEX = flex
|
QMAKE_LEX = flex
|
||||||
QMAKE_LEXFLAGS =
|
QMAKE_LEXFLAGS =
|
||||||
QMAKE_YACC = byacc
|
QMAKE_YACC = bison -y
|
||||||
QMAKE_YACCFLAGS = -d
|
QMAKE_YACCFLAGS = -d
|
||||||
QMAKE_CFLAGS = -pipe
|
QMAKE_CFLAGS = -pipe
|
||||||
QMAKE_CFLAGS_DEPS = -M
|
QMAKE_CFLAGS_DEPS = -M
|
||||||
|
@ -23,7 +23,7 @@ QMAKE_COMPILER = gcc
|
|||||||
QMAKE_CC = $${CROSS_COMPILE}gcc
|
QMAKE_CC = $${CROSS_COMPILE}gcc
|
||||||
QMAKE_LEX = flex
|
QMAKE_LEX = flex
|
||||||
QMAKE_LEXFLAGS =
|
QMAKE_LEXFLAGS =
|
||||||
QMAKE_YACC = byacc
|
QMAKE_YACC = bison -y
|
||||||
QMAKE_YACCFLAGS = -d
|
QMAKE_YACCFLAGS = -d
|
||||||
QMAKE_CFLAGS = -pipe -fno-keep-inline-dllexport
|
QMAKE_CFLAGS = -pipe -fno-keep-inline-dllexport
|
||||||
QMAKE_CFLAGS_DEPS = -M
|
QMAKE_CFLAGS_DEPS = -M
|
||||||
|
@ -15,7 +15,7 @@ QMAKE_COMPILER = msvc intel_icl # icl pretends to be msvc
|
|||||||
QMAKE_CC = icl
|
QMAKE_CC = icl
|
||||||
QMAKE_LEX = flex
|
QMAKE_LEX = flex
|
||||||
QMAKE_LEXFLAGS =
|
QMAKE_LEXFLAGS =
|
||||||
QMAKE_YACC = byacc
|
QMAKE_YACC = bison -y
|
||||||
QMAKE_YACCFLAGS = -d
|
QMAKE_YACCFLAGS = -d
|
||||||
QMAKE_CFLAGS = -nologo -Zm200 /Qprec /Qwd1744,1738
|
QMAKE_CFLAGS = -nologo -Zm200 /Qprec /Qwd1744,1738
|
||||||
QMAKE_CFLAGS_WARN_ON = -W3 /Qwd673
|
QMAKE_CFLAGS_WARN_ON = -W3 /Qwd673
|
||||||
|
Loading…
Reference in New Issue
Block a user