From e2d612a8e48c99104b9794240ea35ae265bbb0f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sat, 28 Mar 2020 09:30:51 +0100 Subject: [PATCH] meson: use find_program() for add-git-hook.sh On azure systemd.systemd ci, the build would fail with: meson.build:53:0: ERROR: Program or command '/home/appuser/fuzzer/tools/add-git-hook.sh' not found or not executable We use find_program() for all helpers, so let's do it for this one too. This should solve the issue, whatever it exactly is. --- meson.build | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/meson.build b/meson.build index d3bdfada85..28042f0ae6 100644 --- a/meson.build +++ b/meson.build @@ -50,9 +50,12 @@ fuzzer_build = want_ossfuzz or want_libfuzzer or want_fuzzbuzz ##################################################################### # Try to install the git pre-commit hook -git_hook = run_command(join_paths(project_source_root, 'tools/add-git-hook.sh')) -if git_hook.returncode() == 0 - message(git_hook.stdout().strip()) +add_git_hook_sh = find_program('tools/add-git-hook.sh', required : false) +if add_git_hook_sh.found() + git_hook = run_command(add_git_hook_sh) + if git_hook.returncode() == 0 + message(git_hook.stdout().strip()) + endif endif #####################################################################