mirrors
/
mesa
mirror of https://gitlab.freedesktop.org/mesa/mesa
1
0
Fork 0
Code Issues 9 Packages Projects Releases Wiki Activity

meson.build: Order the flex/bison by odds of them working 

Some flex/bison installs on windows include yacc and lex
as bash scripts that call bison/flex binaries. That creates
an extra layer of dependencies because those won't work from
plain cmd.exe/powershell. Lets switch the lookup order so that
by default we pickup vanilla binaries instead of scripts.

Reviewd-by: Charmaine Lee <charmainel@vmware.com>
Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7806>
This commit is contained in:
Zack Rusin 2020-11-26 08:50:06 -08:00 committed by Marge Bot
parent 4c285e7080
commit c76edc646b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
meson.build
View File

@ -1685,7 +1685,7 @@ if host_machine.system() == 'windows'
# _fileno functions)
prog_flex = [prog_flex, '--wincompat', '-D__STDC_VERSION__=199901']
else
prog_flex = [find_program('lex', 'flex', required : with_any_opengl)]
prog_flex = [find_program('flex', 'lex', required : with_any_opengl)]
endif
# Force flex to use const keyword in prototypes, as relies on __cplusplus or
# __STDC__ macro to determine whether it's safe to use const keyword, but
@ -1694,7 +1694,7 @@ if host_machine.system() == 'windows'
prog_bison = find_program('win_bison', required : false)
if not prog_bison.found()
prog_bison = find_program('yacc', 'bison', required : with_any_opengl)
prog_bison = find_program('bison', 'yacc', required : with_any_opengl)
endif
else
prog_bison = find_program('bison', required : with_any_opengl)