Module: Mesa Branch: master Commit: c76edc646b35f7dabef101897fd6b37e5488cee5 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=c76edc646b35f7dabef101897fd6b37e5488cee5
Author: Zack Rusin <[email protected]> Date: Thu Nov 26 08:50:06 2020 -0800 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 <[email protected]> Reviewed-by: Erik Faye-Lund <[email protected]> Reviewed-by: Jose Fonseca <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7806> --- meson.build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index ae6ecc60836..08874940f31 100644 --- a/meson.build +++ b/meson.build @@ -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) _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
