From 8ee7b4184189d96e61da5eb16abac9c97e7db3b2 Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Thu, 21 Aug 2025 14:51:44 +0200 Subject: [PATCH] meson: fixup b_sanitize checks Part-of: --- meson.build | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meson.build b/meson.build index b03df2879b9..3b483682b31 100644 --- a/meson.build +++ b/meson.build @@ -1049,10 +1049,10 @@ if cc.has_function_attribute('visibility:hidden') endif _no_sanitize_flags = [] -if ['address', 'address,undefined'].contains(get_option('b_sanitize')) +if get_option('b_sanitize').split(',').contains('address') _no_sanitize_flags += ['address'] endif -if ['undefined', 'address,undefined'].contains(get_option('b_sanitize')) +if get_option('b_sanitize').split(',').contains('undefined') _no_sanitize_flags += ['vptr'] endif foreach flag: _no_sanitize_flags @@ -1931,7 +1931,7 @@ endif # AddressSanitizer's leak reports need all the symbols to be present at exit to # decode well, which runs afoul of our dlopen()/dlclose()ing of the DRI drivers. # Set a flag so we can skip the dlclose for asan builds. -if ['address', 'address,undefined'].contains(get_option('b_sanitize')) +if get_option('b_sanitize').split(',').contains('address') asan_c_args = ['-DBUILT_WITH_ASAN=1'] else asan_c_args = ['-DBUILT_WITH_ASAN=0']