From: Nico Weber Date: Mon, 15 Aug 2022 22:21:56 +0000 (-0400) Subject: [gn build] Try to unbreak mac after f56e486fdc1d X-Git-Tag: upstream/17.0.6~36411 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=73f0ca806e66406cbd34006959b203628209cd72;p=platform%2Fupstream%2Fllvm.git [gn build] Try to unbreak mac after f56e486fdc1d --- 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 6679523..957c679 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" ] + } }