crlib: update to latest revision (fix gcc warnings)
meson: suppress run_command warnings
This commit is contained in:
parent
5bef87900a
commit
e6fe2a6a22
2 changed files with 6 additions and 6 deletions
|
|
@ -1 +1 @@
|
||||||
Subproject commit 9375af6e408b5fcd195c2bce5f2565bc3fbd3160
|
Subproject commit d20fe64b8a1a63b17875fdeb8fb4d8510a0b95d8
|
||||||
10
meson.build
10
meson.build
|
|
@ -36,7 +36,7 @@ cpp = meson.get_compiler ('cpp')
|
||||||
sys = host_machine.system ()
|
sys = host_machine.system ()
|
||||||
target = build_machine.cpu_family ()
|
target = build_machine.cpu_family ()
|
||||||
version = meson.project_version ()
|
version = meson.project_version ()
|
||||||
count = run_command ('git', 'rev-list', '--count', 'HEAD').stdout ().strip ()
|
count = run_command ('git', 'rev-list', '--count', 'HEAD', check: false).stdout ().strip ()
|
||||||
|
|
||||||
cpp_id = cpp.get_id ()
|
cpp_id = cpp.get_id ()
|
||||||
cpp_version = cpp.version ()
|
cpp_version = cpp.version ()
|
||||||
|
|
@ -59,14 +59,14 @@ cdata = configuration_data()
|
||||||
|
|
||||||
if win32
|
if win32
|
||||||
cdata.set ('version_win', ','.join (version.split ('.')))
|
cdata.set ('version_win', ','.join (version.split ('.')))
|
||||||
cdata.set ('machine', run_command ('hostname').stdout ().strip ())
|
cdata.set ('machine', run_command ('hostname', check: false).stdout ().strip ())
|
||||||
else
|
else
|
||||||
cdata.set ('version_win', version)
|
cdata.set ('version_win', version)
|
||||||
cdata.set ('machine', run_command ('hostname', '-f').stdout ().strip ())
|
cdata.set ('machine', run_command ('hostname', '-f', check: false).stdout ().strip ())
|
||||||
endif
|
endif
|
||||||
|
|
||||||
cdata.set ('hash', run_command ('git', 'rev-parse', '--short', 'HEAD').stdout ().strip ())
|
cdata.set ('hash', run_command ('git', 'rev-parse', '--short', 'HEAD', check: false).stdout ().strip ())
|
||||||
cdata.set ('author', run_command ('git', 'log', '--pretty="%ae"', '-1').stdout ().strip ())
|
cdata.set ('author', run_command ('git', 'log', '--pretty="%ae"', '-1', check: false).stdout ().strip ())
|
||||||
|
|
||||||
cdata.set ('count', count)
|
cdata.set ('count', count)
|
||||||
cdata.set ('version', version)
|
cdata.set ('version', version)
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue