From 64fa6a225ea469d36b2bde4eeddb46527c1376b1 Mon Sep 17 00:00:00 2001
From: stevapple <stevapple@icloud.com>
Date: Tue, 15 Sep 2020 08:48:07 +0800
Subject: [PATCH] Enable compiler-rt

---
 .ci/templates/toolchain.yml        | 7 ++++++-
 cmake/caches/org.compnerd.dt.cmake | 1 +
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/.ci/templates/toolchain.yml b/.ci/templates/toolchain.yml
index 8f75df3cb..e470858e3 100644
--- a/.ci/templates/toolchain.yml
+++ b/.ci/templates/toolchain.yml
@@ -228,7 +228,7 @@ jobs:
             -D LLVM_ENABLE_ASSERTIONS=NO
             -D LLVM_ENABLE_LIBEDIT=NO
             -D LLVM_ENABLE_LIBXML2=NO
-            -D LLVM_ENABLE_PROJECTS="clang;lldb"
+            -D LLVM_ENABLE_PROJECTS="clang;compiler-rt;lldb"
             -D LLVM_EXTERNAL_PROJECTS="cmark;swift"
             -D LLVM_EXTERNAL_CMARK_SOURCE_DIR=$(Build.SourcesDirectory)/swift-cmark
             -D LLVM_EXTERNAL_SWIFT_SOURCE_DIR=$(Build.SourcesDirectory)/swift
@@ -261,6 +261,11 @@ jobs:
         inputs:
           cmakeArgs: --build $(Build.BinariesDirectory)/llvm-tools --target lldb-tblgen
 
+      - task: CMake@1
+        displayName: Build TSan Runtime
+        inputs:
+          cmakeArgs: --build $(Build.BinariesDirectory)/llvm-tools --target compiler-rt
+
       - task: CMake@1
         condition: ${{ eq(parameters.VERSION, 'master') }}
         displayName: Build swift-serialize-diagnostics
diff --git a/cmake/caches/org.compnerd.dt.cmake b/cmake/caches/org.compnerd.dt.cmake
index dadc59fb0..0af8aa16a 100644
--- a/cmake/caches/org.compnerd.dt.cmake
+++ b/cmake/caches/org.compnerd.dt.cmake
@@ -4,6 +4,7 @@
 set(LLVM_ENABLE_PROJECTS
       clang
       clang-tools-extra
+      compiler-rt
       lld
       lldb
     CACHE STRING "")