From 5254532e3acc500c8df23d1b62e9d79f8021f6d6 Mon Sep 17 00:00:00 2001 From: Andrea Bolognani Date: Wed, 24 Mar 2021 09:36:19 +0100 Subject: [PATCH] meson: Reorganize looking for programs While this change doesn't look like it would improve things and actually introduces a tiny bit of duplication, it's necessary in order to prepares the stage for further changes. Signed-off-by: Andrea Bolognani Reviewed-by: Erik Skultety --- build-aux/meson.build | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/build-aux/meson.build b/build-aux/meson.build index 06b7a7c01f..c56a348946 100644 --- a/build-aux/meson.build +++ b/build-aux/meson.build @@ -10,12 +10,14 @@ syntax_check_conf.set('flake8_path', flake8_path) syntax_check_conf.set('runutf8', ' '.join(runutf8)) syntax_check_conf.set('PYTHON3', python3_prog.path()) - -grep_prog = find_program('grep') - if host_machine.system() == 'freebsd' make_prog = find_program('gmake') +else + make_prog = find_program('make') +endif +if host_machine.system() == 'freebsd' + grep_prog = find_program('grep') grep_cmd = run_command(grep_prog, '--version') if grep_cmd.stdout().startswith('grep (BSD grep') grep_prog = find_program('/usr/local/bin/grep', required: false) @@ -28,7 +30,7 @@ if host_machine.system() == 'freebsd' endif endif else - make_prog = find_program('make') + grep_prog = find_program('grep') endif syntax_check_conf.set('GREP', grep_prog.path()) -- 2.47.2