fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-03-13 15:20:31 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

meson: Ignore unused variables when assertions are disabled

Browse source 
Fixes: 46b099e3
("meson: Ignore unused variables in release builds")

46b099e3 has some issues:
- it doesn't enable unused variables warning on release builds
with assertions enabled;
- it doesn't disable unused variables warning on debug builds
with assertions disabled;
- it doesn't disable unused variables warning when building
with MSVC and assertions are disabled regardless of buildtype,
see #8147. 3/4 regressions reported there have this limitation
alone as root cause.

Reviewed-by: Emma Anholt <emma@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21154>
(cherry picked from commit 4347072443)
This commit is contained in:
pal1000 2023-02-07 01:35:45 +02:00 • committed by Eric Engestrom
parent 3e5da1cc33
commit 9d4413d65f
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -850,7 +850,7 @@
"description": "meson: Ignore unused variables when assertions are disabled",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": "46b099e3925d118b1637505b1f26de50059649aa"
},

12
meson.build
View file

@ -1203,12 +1203,12 @@ else
_trial_cpp += ['-ffunction-sections', '-fdata-sections']
endif
# Variables that are only used for assertions are considered unused in release
# builds. Don't treat this as an error, since we build with -Werror even for
# release in CI.
if get_option('buildtype') == 'release'
_trial_c += ['-Wno-unused-variable', '-Wno-unused-but-set-variable']
_trial_cpp += ['-Wno-unused-variable', '-Wno-unused-but-set-variable']
# Variables that are only used for assertions are considered unused when assertions
# are disabled. Don't treat this as an error, since we build with -Werror even if
# assertions are disabled.
if get_option('b_ndebug') == 'true' or (get_option('buildtype') == 'release' and get_option('b_ndebug') == 'if-release')
_trial_c += ['-Wno-unused-variable', '-Wno-unused-but-set-variable', '/wd4189']
_trial_cpp += ['-Wno-unused-variable', '-Wno-unused-but-set-variable', '/wd4189']
endif
c_args += cc.get_supported_arguments(_trial_c)