fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-20 07:20:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

meson: move tsan-blacklist.txt to build-support with the other build support files

Browse source 
Fixes: 0d46e0e88b ("meson: Add blacklist when compiling with tsan")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28996>
(cherry picked from commit 47f6e24ad5)
This commit is contained in:
Eric Engestrom 2024-04-30 23:00:14 +02:00 • committed by Eric Engestrom
parent b52d5496d8
commit 4e0125bdaa
3 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -4,7 +4,7 @@
"description": "meson: move tsan-blacklist.txt to build-support with the other build support files", "description": "meson: move tsan-blacklist.txt to build-support with the other build support files",
"nominated": true, "nominated": true,
"nomination_type": 1, "nomination_type": 1,
"resolution": 0, "resolution": 1,
"main_sha": null, "main_sha": null,
"because_sha": "0d46e0e88bdeb8bfff3b30c65002cc34d3b7ba4e", "because_sha": "0d46e0e88bdeb8bfff3b30c65002cc34d3b7ba4e",
"notes": null "notes": null

0
tsan-blacklist.txt → build-support/tsan-blacklist.txt
View file

2
meson.build
View file

@ -1927,7 +1927,7 @@ if get_option('b_sanitize') == 'thread'
# meson versions prior to 1.4 will warn "Consider using the built-in option for sanitizers ..." # meson versions prior to 1.4 will warn "Consider using the built-in option for sanitizers ..."
# later on because it only checks whether the option starts with "-fsanitize", # later on because it only checks whether the option starts with "-fsanitize",
# but there is no built-in option for adding a blacklist # but there is no built-in option for adding a blacklist
tsan_blacklist = '-fsanitize-blacklist=@0@'.format(join_paths(meson.project_source_root(), 'tsan-blacklist.txt')) tsan_blacklist = '-fsanitize-blacklist=@0@'.format(join_paths(meson.project_source_root(), 'build-support', 'tsan-blacklist.txt'))
if cc.has_argument(tsan_blacklist) if cc.has_argument(tsan_blacklist)
pre_args += tsan_blacklist pre_args += tsan_blacklist
else else