fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-06 05:08:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

meson: avoid calling nm.full_path() when tool is not found

Browse source 
If tool isn't found, we shouldn't call full_path() on it.
This is the case for Android + meson2hermetic.

Fixes: 2f652e0b36 ("meson: move the generic symbols check arguments to a common variable")
Cc: mesa-stable

Reviewed-by: Eric Engestrom <eric@igalia.com>
(cherry picked from commit 4bb3b80b8f)

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/39462>
This commit is contained in:
Gurchetan Singh 2025-10-13 14:20:47 -07:00 • committed by Dylan Baker
parent 4301d7fa82
commit d885f0506a
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -64,7 +64,7 @@
"description": "meson: avoid calling nm.full_path() when tool is not found",
"nominated": true,
"nomination_type": 2,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": "2f652e0b3691e94d6a81e37985741d35561b2312",
"notes": null

4
meson.build
View file

@ -2269,7 +2269,9 @@ elif host_machine.system() == 'windows' and cc.get_argument_syntax() != 'msvc'
else
prog_nm = find_program('nm')
with_symbols_check = prog_nm.found() and with_tests
symbols_check_args = ['--nm', prog_nm.full_path()]
if with_symbols_check
symbols_check_args = ['--nm', prog_nm.full_path()]
endif
endif
# This quirk needs to be applied to sources with functions defined in assembly