mirror of
https://gitlab.freedesktop.org/mesa/mesa.git
synced 2025-12-20 13:50:11 +01:00
meson: only run symbols-check if nm is available
And drop the redundant check from symbols-check.py, which was actually masking all kinds of issues. Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/35891>
This commit is contained in:
parent
f350803fb3
commit
4be493862d
2 changed files with 10 additions and 14 deletions
|
|
@ -141,19 +141,15 @@ def main():
|
||||||
help='do not process this symbol')
|
help='do not process this symbol')
|
||||||
args = parser.parse_args()
|
args = parser.parse_args()
|
||||||
|
|
||||||
try:
|
if platform.system() == 'Windows':
|
||||||
if platform.system() == 'Windows':
|
if not args.dumpbin:
|
||||||
if not args.dumpbin:
|
parser.error('--dumpbin is mandatory')
|
||||||
parser.error('--dumpbin is mandatory')
|
lib_symbols = get_symbols_dumpbin(args.dumpbin, args.lib)
|
||||||
lib_symbols = get_symbols_dumpbin(args.dumpbin, args.lib)
|
else:
|
||||||
else:
|
if not args.nm:
|
||||||
if not args.nm:
|
parser.error('--nm is mandatory')
|
||||||
parser.error('--nm is mandatory')
|
lib_symbols = get_symbols_nm(args.nm, args.lib)
|
||||||
lib_symbols = get_symbols_nm(args.nm, args.lib)
|
|
||||||
except:
|
|
||||||
# We can't run this test, but we haven't technically failed it either
|
|
||||||
# Return the GNU "skip" error code
|
|
||||||
exit(77)
|
|
||||||
mandatory_symbols = []
|
mandatory_symbols = []
|
||||||
optional_symbols = []
|
optional_symbols = []
|
||||||
with open(args.symbols_file) as symbols_file:
|
with open(args.symbols_file) as symbols_file:
|
||||||
|
|
|
||||||
|
|
@ -2233,7 +2233,7 @@ if host_machine.system() == 'windows'
|
||||||
endif
|
endif
|
||||||
else
|
else
|
||||||
prog_nm = find_program('nm')
|
prog_nm = find_program('nm')
|
||||||
with_symbols_check = with_tests
|
with_symbols_check = prog_nm.found() and with_tests
|
||||||
symbols_check_args = ['--nm', prog_nm.full_path()]
|
symbols_check_args = ['--nm', prog_nm.full_path()]
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue