diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2015-06-24 13:18:48 -0700 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2015-07-20 16:09:07 +0000 |
| commit | 6636320867016b3e1c9f15e0a9c17d3a132426e1 (patch) | |
| tree | 3c7372a494e0cd77d796b6fb876506e7fc86810f | |
| parent | db2fc7843c031c450799269ad82f379d358f29a5 (diff) | |
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>
| -rw-r--r-- | mkspecs/common/msvc-desktop.conf | 2 | ||||
| -rw-r--r-- | mkspecs/common/wince/qmake.conf | 2 | ||||
| -rw-r--r-- | mkspecs/common/winrt_winphone/qmake.conf | 2 | ||||
| -rw-r--r-- | mkspecs/cygwin-g++/qmake.conf | 2 | ||||
| -rw-r--r-- | mkspecs/win32-g++/qmake.conf | 2 | ||||
| -rw-r--r-- | mkspecs/win32-icc/qmake.conf | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/mkspecs/common/msvc-desktop.conf b/mkspecs/common/msvc-desktop.conf index e638af6b6a..e1abca46e4 100644 --- a/mkspecs/common/msvc-desktop.conf +++ b/mkspecs/common/msvc-desktop.conf @@ -23,7 +23,7 @@ contains(QMAKE_TARGET.arch, x86_64) { QMAKE_CC = cl QMAKE_LEX = flex QMAKE_LEXFLAGS = -QMAKE_YACC = byacc +QMAKE_YACC = bison -y QMAKE_YACCFLAGS = -d QMAKE_CFLAGS = -nologo -Zc:wchar_t QMAKE_CFLAGS_WARN_ON = -W3 diff --git a/mkspecs/common/wince/qmake.conf b/mkspecs/common/wince/qmake.conf index 434e063de8..3eac38f6b7 100644 --- a/mkspecs/common/wince/qmake.conf +++ b/mkspecs/common/wince/qmake.conf @@ -15,7 +15,7 @@ QMAKE_COMPILER = msvc QMAKE_CC = cl QMAKE_LEX = flex QMAKE_LEXFLAGS = -QMAKE_YACC = byacc +QMAKE_YACC = bison -y QMAKE_YACCFLAGS = -d QMAKE_CFLAGS = -nologo -Zm200 -Zc:wchar_t- QMAKE_CFLAGS_WARN_ON = -W3 diff --git a/mkspecs/common/winrt_winphone/qmake.conf b/mkspecs/common/winrt_winphone/qmake.conf index 97ef661230..ca5119bded 100644 --- a/mkspecs/common/winrt_winphone/qmake.conf +++ b/mkspecs/common/winrt_winphone/qmake.conf @@ -16,7 +16,7 @@ DEPLOYMENT_PLUGIN += qwinrt QMAKE_CC = cl QMAKE_LEX = flex QMAKE_LEXFLAGS = -QMAKE_YACC = byacc +QMAKE_YACC = bison -y QMAKE_YACCFLAGS = -d QMAKE_CFLAGS = -nologo QMAKE_CFLAGS_WARN_ON = -W3 diff --git a/mkspecs/cygwin-g++/qmake.conf b/mkspecs/cygwin-g++/qmake.conf index caed4133b1..53cd35611f 100644 --- a/mkspecs/cygwin-g++/qmake.conf +++ b/mkspecs/cygwin-g++/qmake.conf @@ -14,7 +14,7 @@ QMAKE_COMPILER = gcc QMAKE_CC = gcc QMAKE_LEX = flex QMAKE_LEXFLAGS = -QMAKE_YACC = byacc +QMAKE_YACC = bison -y QMAKE_YACCFLAGS = -d QMAKE_CFLAGS = -pipe QMAKE_CFLAGS_DEPS = -M diff --git a/mkspecs/win32-g++/qmake.conf b/mkspecs/win32-g++/qmake.conf index ca5ac2bdce..019c220de5 100644 --- a/mkspecs/win32-g++/qmake.conf +++ b/mkspecs/win32-g++/qmake.conf @@ -23,7 +23,7 @@ QMAKE_COMPILER = gcc QMAKE_CC = $${CROSS_COMPILE}gcc QMAKE_LEX = flex QMAKE_LEXFLAGS = -QMAKE_YACC = byacc +QMAKE_YACC = bison -y QMAKE_YACCFLAGS = -d QMAKE_CFLAGS = -pipe -fno-keep-inline-dllexport QMAKE_CFLAGS_DEPS = -M diff --git a/mkspecs/win32-icc/qmake.conf b/mkspecs/win32-icc/qmake.conf index 2ec0d84918..31c87fff26 100644 --- a/mkspecs/win32-icc/qmake.conf +++ b/mkspecs/win32-icc/qmake.conf @@ -15,7 +15,7 @@ QMAKE_COMPILER = msvc intel_icl # icl pretends to be msvc QMAKE_CC = icl QMAKE_LEX = flex QMAKE_LEXFLAGS = -QMAKE_YACC = byacc +QMAKE_YACC = bison -y QMAKE_YACCFLAGS = -d QMAKE_CFLAGS = -nologo -Zm200 /Qprec /Qwd1744,1738 QMAKE_CFLAGS_WARN_ON = -W3 /Qwd673 |