admin/git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'ps/meson-bin-sh'

Browse Source 
Meson-based build framework update.

* ps/meson-bin-sh:
  meson: prefer shell at "/bin/sh"
  meson: report detected runtime executable paths
This commit is contained in:
Junio C Hamano
2025-05-12 14:22:50 -07:00
parent a4ad13dd19 4cba20fbdc
commit b8cc1a9acd
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
meson.build
View File

@@ -243,7 +243,11 @@ shell = find_program('sh', dirs: program_path, native: true)
tar = find_program('tar', dirs: program_path, native: true) tar = find_program('tar', dirs: program_path, native: true)
time = find_program('time', dirs: program_path, required: get_option('benchmarks')) time = find_program('time', dirs: program_path, required: get_option('benchmarks'))
target_shell = find_program('sh', dirs: program_path, native: false) # Detect the target shell that is used by Git at runtime. Note that we prefer
# "/bin/sh" over a PATH-based lookup, which provides a working shell on most
# supported systems. This path is also the default shell path used by our
# Makefile. This lookup can be overridden via `program_path`.
target_shell = find_program('sh', dirs: program_path + [ '/bin' ], native: false)
# Sanity-check that programs required for the build exist. # Sanity-check that programs required for the build exist.
foreach tool : ['cat', 'cut', 'grep', 'sort', 'tr', 'uname'] foreach tool : ['cat', 'cut', 'grep', 'sort', 'tr', 'uname']
@@ -2174,3 +2178,9 @@ summary({
'sha256': sha256_backend, 'sha256': sha256_backend,
'zlib': zlib_backend, 'zlib': zlib_backend,
}, section: 'Backends') }, section: 'Backends')
summary({
'perl': target_perl,
'python': target_python,
'shell': target_shell,
}, section: 'Runtime executable paths')