[llvm] 6ef9af6 - gn build: Disable ubsan build on mac/win.

[Peter Collingbourne via llvm-commits]

Author: Peter Collingbourne
Date: 2022-06-13T13:45:14-07:00
New Revision: 6ef9af6386fe7cd9d5d93342c430528baa8d1026

URL: https://github.com/llvm/llvm-project/commit/6ef9af6386fe7cd9d5d93342c430528baa8d1026
DIFF: https://github.com/llvm/llvm-project/commit/6ef9af6386fe7cd9d5d93342c430528baa8d1026.diff

LOG: gn build: Disable ubsan build on mac/win.

Build failures:
http://45.33.8.238/macm1/37263/step_4.txt
http://45.33.8.238/win/60034/step_4.txt

Added: 
    

Modified: 
    llvm/utils/gn/secondary/compiler-rt/lib/BUILD.gn
    llvm/utils/gn/secondary/compiler-rt/lib/ubsan/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 62d3270150b8..92bd37f5495d 100644
--- a/llvm/utils/gn/secondary/compiler-rt/lib/BUILD.gn
+++ b/llvm/utils/gn/secondary/compiler-rt/lib/BUILD.gn
@@ -19,9 +19,9 @@ group("lib") {
     deps += [ "//compiler-rt/lib/builtins" ]
   }
   if (current_os != "baremetal") {
-    deps += [
-      "//compiler-rt/lib/profile",
-      "//compiler-rt/lib/ubsan:ubsan_shared",
-    ]
+    deps += [ "//compiler-rt/lib/profile" ]
+  }
+  if (current_os != "win" && current_os != "mac" && current_os != "baremetal") {
+    deps += [ "//compiler-rt/lib/ubsan:ubsan_shared" ]
   }
 }

diff  --git a/llvm/utils/gn/secondary/compiler-rt/lib/ubsan/BUILD.gn b/llvm/utils/gn/secondary/compiler-rt/lib/ubsan/BUILD.gn
index 50ed1be0285a..af47149074d5 100644
--- a/llvm/utils/gn/secondary/compiler-rt/lib/ubsan/BUILD.gn
+++ b/llvm/utils/gn/secondary/compiler-rt/lib/ubsan/BUILD.gn
@@ -124,11 +124,8 @@ shared_library("ubsan_shared") {
     ":cxx_sources",
     ":sources",
     ":standalone_sources",
+    ":version_script",
   ]
-  if (current_os != "mac" && current_os != "win") {
-    deps += [ ":version_script" ]
-    inputs = [ "$target_gen_dir/ubsan.vers" ]
-    ldflags =
-        [ "-Wl,--version-script," + rebase_path(inputs[0], root_build_dir) ]
-  }
+  inputs = [ "$target_gen_dir/ubsan.vers" ]
+  ldflags = [ "-Wl,--version-script," + rebase_path(inputs[0], root_build_dir) ]
 }