[llvm] 03c4119 - [gn build] hook up tsan on macOS too

[Nico Weber via llvm-commits]

Author: Nico Weber
Date: 2021-04-02T19:21:38-04:00
New Revision: 03c41191af1e171a234bf30196189a93da52b8a6

URL: https://github.com/llvm/llvm-project/commit/03c41191af1e171a234bf30196189a93da52b8a6
DIFF: https://github.com/llvm/llvm-project/commit/03c41191af1e171a234bf30196189a93da52b8a6.diff

LOG: [gn build] hook up tsan on macOS too

Mostly just works already.

Added: 
    

Modified: 
    llvm/utils/gn/secondary/compiler-rt/lib/BUILD.gn
    llvm/utils/gn/secondary/compiler-rt/lib/tsan/BUILD.gn

Removed: 
    


################################################################################
diff  --git a/llvm/utils/gn/secondary/compiler-rt/lib/BUILD.gn b/llvm/utils/gn/secondary/compiler-rt/lib/BUILD.gn
index a99f8ad1470b0..806cd7c480f31 100644
--- a/llvm/utils/gn/secondary/compiler-rt/lib/BUILD.gn
+++ b/llvm/utils/gn/secondary/compiler-rt/lib/BUILD.gn
@@ -3,9 +3,6 @@ group("lib") {
     "//compiler-rt/lib/asan",
     "//compiler-rt/lib/builtins",
     "//compiler-rt/lib/profile",
+    "//compiler-rt/lib/tsan" ,
   ]
-  if (target_os == "linux") {
-    # FIXME: Make work on macOS.
-    deps += [ "//compiler-rt/lib/tsan" ]
-  }
 }

diff  --git a/llvm/utils/gn/secondary/compiler-rt/lib/tsan/BUILD.gn b/llvm/utils/gn/secondary/compiler-rt/lib/tsan/BUILD.gn
index 675a0a91d8791..dcc23b5949cd9 100644
--- a/llvm/utils/gn/secondary/compiler-rt/lib/tsan/BUILD.gn
+++ b/llvm/utils/gn/secondary/compiler-rt/lib/tsan/BUILD.gn
@@ -145,12 +145,7 @@ target(tsan_target_type, "tsan") {
     ldflags = [
       "-lc++",
       "-lc++abi",
-
-      # tsan
-      # FIXME
-
-      # ubsan
-      "-Wl,-U,___ubsan_default_options",
+      "-lobjc",
 
       # sanitizer_common
       "-Wl,-U,___sanitizer_free_hook",