emo/openrc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build: fix run_command warning

Browse Source 
The default behavior of check: false is going to change to true in the
future, see <https://github.com/mesonbuild/meson/issues/9300>.

Thus we are explicit about the desired behavior. The error in uname is
important but with test we check ourselves using returncode().

This fixes #556.
This commit is contained in:
Nikolaos Chatzikonstantinou 2022-10-22 15:35:29 -04:00 committed by William Hubbs
parent 02b064a591
commit 35077afb68
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
meson.build
View File

@ -36,7 +36,7 @@ endif
option_os = get_option('os') option_os = get_option('os')
if option_os == '' if option_os == ''
uname = find_program('uname') uname = find_program('uname')
r = run_command(uname, '-s') r = run_command(uname, '-s', check: true)
os = r.stdout().strip() os = r.stdout().strip()
os = '-'.join(os.split('/')) os = '-'.join(os.split('/'))
else else
@ -84,7 +84,7 @@ else
endif endif
if get_option('split-usr') == 'auto' if get_option('split-usr') == 'auto'
split_usr = run_command('test', '-L', '/bin').returncode() != 0 split_usr = run_command('test', '-L', '/bin', check: false).returncode() != 0
else else
split_usr = get_option('split-usr') == 'true' split_usr = get_option('split-usr') == 'true'
endif endif