Skip to content

Commit 64de78c

Browse files
committed
Merge branch 'ps/meson-bin-sh' into seen
* ps/meson-bin-sh: meson: prefer POSIX-specified shell path meson: report detected runtime executable paths
2 parents c6eaeaf + 0f6379d commit 64de78c

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

meson.build

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ sed = find_program('sed', dirs: program_path, native: true)
242242
shell = find_program('sh', dirs: program_path, native: true)
243243
tar = find_program('tar', dirs: program_path, native: true)
244244

245-
target_shell = find_program('sh', dirs: program_path, native: false)
245+
target_shell = find_program('sh', dirs: program_path + [ '/bin' ], native: false)
246246
time = find_program('time', dirs: program_path, native: true, required: false)
247247

248248
# Sanity-check that programs required for the build exist.
@@ -2193,3 +2193,9 @@ summary({
21932193
'sha256': sha256_backend,
21942194
'zlib': zlib_backend,
21952195
}, section: 'Backends')
2196+
2197+
summary({
2198+
'perl': target_perl.found() ? target_perl.full_path() : 'none',
2199+
'python': target_python.found() ? target_python.full_path() : 'none',
2200+
'shell': target_shell.full_path(),
2201+
}, section: 'Runtime executable paths')

0 commit comments

Comments
 (0)