From: Patrick Steinhardt Date: Thu, 24 Apr 2025 13:38:15 GMT Subject: [PATCH 2/2] meson: prefer POSIX-specified shell path Message-ID: <20250424-pks-meson-posix-shell-v1-2-45e06ee4b6ad@pks.im> In-Reply-To: <20250424-pks-meson-posix-shell-v1-0-45e06ee4b6ad@pks.im> Meson detects the path of the target shell via `find_program("sh")`, which essentially does a lookup via `PATH`. This may easily lead to a subtly-broken Git distribution when the build host has its shell in a non-standard location that the target host doesn't know about. Fix the issue by appending "/bin" to the custom program path, which causes us to prefer "/bin/sh" over a `PATH` lookup. As this location is specified by POSIX this should make us pick a better default shell path on all POSIX-compliant systems. Note that we intentionally append, not prepend, to the custom program path. This is because the program path can be configured by the user via the `-Dsane_tool_path=` build option, which should take precedence over any defaults we pick for the user. Signed-off-by: Patrick Steinhardt --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 8f04534c7ff..1db768380bd 100644 --- a/meson.build +++ b/meson.build @@ -236,7 +236,7 @@ sed = find_program('sed', dirs: program_path, native: true) shell = find_program('sh', dirs: program_path, native: true) tar = find_program('tar', dirs: program_path, native: true) -target_shell = find_program('sh', dirs: program_path, native: false) +target_shell = find_program('sh', dirs: program_path + [ '/bin' ], native: false) # Sanity-check that programs required for the build exist. foreach tool : ['cat', 'cut', 'grep', 'sort', 'tr', 'uname'] -- 2.49.0.901.g37484f566f.dirty