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>

diff --git a/meson.build b/meson.build
index ae6ecc60836705ff0e93be73156b2afa39f1222d..08874940f3166d3dc380a2765b6179d54f21feba 100644 (file)
--- 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)