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>
This commit is contained in:
committed by
Junio C Hamano
parent
42846efc3b
commit
16c89dcf80
@@ -41,7 +41,7 @@ custom_target(
|
|||||||
foreach howto : howto_sources
|
foreach howto : howto_sources
|
||||||
howto_stripped = custom_target(
|
howto_stripped = custom_target(
|
||||||
command: [
|
command: [
|
||||||
find_program('sed'),
|
sed,
|
||||||
'-e',
|
'-e',
|
||||||
'1,/^$/d',
|
'1,/^$/d',
|
||||||
'@INPUT@',
|
'@INPUT@',
|
||||||
|
|||||||
@@ -201,11 +201,12 @@ endif
|
|||||||
cygpath = find_program('cygpath', dirs: program_path, required: false)
|
cygpath = find_program('cygpath', dirs: program_path, required: false)
|
||||||
diff = find_program('diff', dirs: program_path)
|
diff = find_program('diff', dirs: program_path)
|
||||||
git = find_program('git', dirs: program_path, required: false)
|
git = find_program('git', dirs: program_path, required: false)
|
||||||
|
sed = find_program('sed', dirs: program_path)
|
||||||
shell = find_program('sh', dirs: program_path)
|
shell = find_program('sh', dirs: program_path)
|
||||||
tar = find_program('tar', dirs: program_path)
|
tar = find_program('tar', dirs: program_path)
|
||||||
|
|
||||||
# Sanity-check that programs required for the build exist.
|
# 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)
|
find_program(tool, dirs: program_path)
|
||||||
endforeach
|
endforeach
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user