Skip to content

Commit 06e7a5e

Browse files
authored
[5.6] tsan libdispatch: invoke correct CMake, target proper sources (#41203)
This addresses a build failure on TSAN - libdispatch Linux bots Cherry-pick of #41135 Addresses rdar://88339546
1 parent 0919f98 commit 06e7a5e

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

utils/swift_build_support/swift_build_support/products/tsan_libdispatch.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,15 @@ def should_build(self, host_target):
4848

4949
def build(self, host_target):
5050
"""Build TSan runtime (compiler-rt)."""
51-
rt_source_dir = join_path(self.source_dir, os.pardir, 'compiler-rt')
51+
rt_source_dir = join_path(
52+
self.source_dir, os.pardir,
53+
'llvm-project', 'compiler-rt')
5254
toolchain_path = join_path(self.args.install_destdir, 'usr')
5355
clang = join_path(toolchain_path, 'bin', 'clang')
5456
clangxx = join_path(toolchain_path, 'bin', 'clang++')
5557

5658
config_cmd = [
57-
'cmake',
59+
self.toolchain.cmake,
5860
'-GNinja',
5961
'-DCMAKE_PREFIX_PATH=%s' % toolchain_path,
6062
'-DCMAKE_C_COMPILER=%s' % clang,

0 commit comments

Comments
 (0)