diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-05-12 14:22:50 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-05-12 14:22:50 -0700 |
| commit | b8cc1a9acdc9e25e0b7049299109689a9dcfe866 (patch) | |
| tree | 97ecd2a4d3093f104272982014b5a88559f573bc | |
| parent | Merge branch 'ng/xdiff-truly-minimal' (diff) | |
| parent | meson: prefer shell at "/bin/sh" (diff) | |
| download | git-b8cc1a9acdc9e25e0b7049299109689a9dcfe866.tar.gz git-b8cc1a9acdc9e25e0b7049299109689a9dcfe866.zip | |
Merge branch 'ps/meson-bin-sh'
Meson-based build framework update.
* ps/meson-bin-sh:
meson: prefer shell at "/bin/sh"
meson: report detected runtime executable paths
| -rw-r--r-- | meson.build | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/meson.build b/meson.build index 270ce933d0..148ae668eb 100644 --- a/meson.build +++ b/meson.build @@ -243,7 +243,11 @@ shell = find_program('sh', 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')) -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. foreach tool : ['cat', 'cut', 'grep', 'sort', 'tr', 'uname'] @@ -2174,3 +2178,9 @@ summary({ 'sha256': sha256_backend, 'zlib': zlib_backend, }, section: 'Backends') + +summary({ + 'perl': target_perl, + 'python': target_python, + 'shell': target_shell, +}, section: 'Runtime executable paths') |