diff options
| author | Patrick Steinhardt <ps@pks.im> | 2025-02-26 09:22:20 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-02-26 09:09:36 -0800 |
| commit | 16c89dcf80b742276d927b99fe28dbcde1469417 (patch) | |
| tree | 2d21b0adc3f03e614dc816ebcf7944a6c619e4ff | |
| parent | meson: improve handling of `sane_tool_path` option (diff) | |
| download | git-16c89dcf80b742276d927b99fe28dbcde1469417.tar.gz git-16c89dcf80b742276d927b99fe28dbcde1469417.zip | |
meson: prevent finding sed(1) in a loop
We're searching for the sed(1) executable in a loop, which will make us
try to find it multiple times. Starting with the preceding commit we
already declare a variable for that program in the top-level build file.
Use it so that we only need to search for the program once.
Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | Documentation/howto/meson.build | 2 | ||||
| -rw-r--r-- | meson.build | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/Documentation/howto/meson.build b/Documentation/howto/meson.build index c023c10416..92a08b13ee 100644 --- a/Documentation/howto/meson.build +++ b/Documentation/howto/meson.build @@ -41,7 +41,7 @@ custom_target( foreach howto : howto_sources howto_stripped = custom_target( command: [ - find_program('sed'), + sed, '-e', '1,/^$/d', '@INPUT@', diff --git a/meson.build b/meson.build index ed857aaa4a..5bf6a914ea 100644 --- a/meson.build +++ b/meson.build @@ -201,11 +201,12 @@ endif cygpath = find_program('cygpath', dirs: program_path, required: false) diff = find_program('diff', dirs: program_path) git = find_program('git', dirs: program_path, required: false) +sed = find_program('sed', dirs: program_path) shell = find_program('sh', dirs: program_path) tar = find_program('tar', dirs: program_path) # Sanity-check that programs required for the build exist. -foreach tool : ['cat', 'cut', 'grep', 'sed', 'sort', 'tr', 'uname'] +foreach tool : ['cat', 'cut', 'grep', 'sort', 'tr', 'uname'] find_program(tool, dirs: program_path) endforeach |