Skip to content

Commit 47f6e24

Browse files
1aceMarge Bot
authored and
Marge Bot
committed
meson: move tsan-blacklist.txt to build-support with the other build support files
Fixes: 0d46e0e ("meson: Add blacklist when compiling with tsan") Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28996>
1 parent 8413947 commit 47f6e24

File tree

2 files changed

+1
-1
lines changed

2 files changed

+1
-1
lines changed
File renamed without changes.

meson.build

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

0 commit comments

Comments
 (0)