[llvm] 73f0ca8 - [gn build] Try to unbreak mac after f56e486fdc1d
Nico Weber via llvm-commits
llvm-commits at lists.llvm.org
Mon Aug 15 15:22:15 PDT 2022
Author: Nico Weber
Date: 2022-08-15T18:22:08-04:00
New Revision: 73f0ca806e66406cbd34006959b203628209cd72
URL: https://github.com/llvm/llvm-project/commit/73f0ca806e66406cbd34006959b203628209cd72
DIFF: https://github.com/llvm/llvm-project/commit/73f0ca806e66406cbd34006959b203628209cd72.diff
LOG: [gn build] Try to unbreak mac after f56e486fdc1d
Added:
Modified:
llvm/utils/gn/secondary/compiler-rt/lib/ubsan/BUILD.gn
Removed:
################################################################################
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 6679523dd2be9..957c67909724f 100644
--- a/llvm/utils/gn/secondary/compiler-rt/lib/ubsan/BUILD.gn
+++ b/llvm/utils/gn/secondary/compiler-rt/lib/ubsan/BUILD.gn
@@ -86,30 +86,33 @@ source_set("cxx_sources") {
]
}
-static_library("ubsan_standalone") {
- output_dir = crt_current_out_dir
- output_name = "clang_rt.ubsan_standalone$crt_current_target_suffix"
- complete_static_lib = true
- configs -= [
- "//llvm/utils/gn/build:llvm_code",
- "//llvm/utils/gn/build:thin_archive",
- ]
- deps = [
- ":sources",
- ":standalone_sources",
- ]
- configs += [ "//llvm/utils/gn/build:crt_code" ]
- sources = [ "ubsan_init_standalone_preinit.cpp" ]
-}
+# FIXME: Make ubsan_standalone work on mac.
+if (current_os != "mac") {
+ static_library("ubsan_standalone") {
+ output_dir = crt_current_out_dir
+ output_name = "clang_rt.ubsan_standalone$crt_current_target_suffix"
+ complete_static_lib = true
+ configs -= [
+ "//llvm/utils/gn/build:llvm_code",
+ "//llvm/utils/gn/build:thin_archive",
+ ]
+ deps = [
+ ":sources",
+ ":standalone_sources",
+ ]
+ configs += [ "//llvm/utils/gn/build:crt_code" ]
+ sources = [ "ubsan_init_standalone_preinit.cpp" ]
+ }
-static_library("ubsan_standalone_cxx") {
- output_dir = crt_current_out_dir
- output_name = "clang_rt.ubsan_standalone_cxx$crt_current_target_suffix"
- complete_static_lib = true
- configs -= [
- "//llvm/utils/gn/build:llvm_code",
- "//llvm/utils/gn/build:thin_archive",
- ]
- deps = [ ":cxx_sources" ]
- configs += [ "//llvm/utils/gn/build:crt_code" ]
+ static_library("ubsan_standalone_cxx") {
+ output_dir = crt_current_out_dir
+ output_name = "clang_rt.ubsan_standalone_cxx$crt_current_target_suffix"
+ complete_static_lib = true
+ configs -= [
+ "//llvm/utils/gn/build:llvm_code",
+ "//llvm/utils/gn/build:thin_archive",
+ ]
+ deps = [ ":cxx_sources" ]
+ configs += [ "//llvm/utils/gn/build:crt_code" ]
+ }
}
More information about the llvm-commits
mailing list