From 47f6e24ad5dfcb59dd1511800aee8c56b4f8fee4 Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Tue, 30 Apr 2024 23:00:14 +0200 Subject: [PATCH] meson: move tsan-blacklist.txt to build-support with the other build support files Fixes: 0d46e0e88bdeb8bfff3b ("meson: Add blacklist when compiling with tsan") Part-of: --- tsan-blacklist.txt => build-support/tsan-blacklist.txt | 0 meson.build | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename tsan-blacklist.txt => build-support/tsan-blacklist.txt (100%) diff --git a/tsan-blacklist.txt b/build-support/tsan-blacklist.txt similarity index 100% rename from tsan-blacklist.txt rename to build-support/tsan-blacklist.txt diff --git a/meson.build b/meson.build index 24709d65eb4..a5419542c10 100644 --- a/meson.build +++ b/meson.build @@ -1923,7 +1923,7 @@ if get_option('b_sanitize') == 'thread' # 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", # 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) pre_args += tsan_blacklist else