From ee21411107aa18e191a25380b9e4679f3909a0c7 Mon Sep 17 00:00:00 2001 From: Peter Collingbourne Date: Mon, 13 Jun 2022 13:52:27 -0700 Subject: [PATCH] gn build: Don't define an action for gen_version_script on mac/win. Nothing should depend on the action on those platforms, as they don't use version scripts. Should fix mac build: http://45.33.8.238/macm1/37264/step_4.txt --- .../secondary/compiler-rt/gen_version_script.gni | 42 +++++++++++----------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/llvm/utils/gn/secondary/compiler-rt/gen_version_script.gni b/llvm/utils/gn/secondary/compiler-rt/gen_version_script.gni index ebbf64b..5b5ffe3 100644 --- a/llvm/utils/gn/secondary/compiler-rt/gen_version_script.gni +++ b/llvm/utils/gn/secondary/compiler-rt/gen_version_script.gni @@ -1,28 +1,28 @@ import("//compiler-rt/target.gni") template("gen_version_script") { - action(target_name) { - script = "//compiler-rt/lib/sanitizer_common/scripts/gen_dynamic_list.py" - sources = [ invoker.extra ] - deps = invoker.libs - outputs = [ invoker.output ] - args = [ - "--version-list", - "--extra", - rebase_path(invoker.extra, root_build_dir), - ] - foreach (lib_name, invoker.lib_names) { + if (current_os != "mac" && current_os != "win") { + action(target_name) { + script = "//compiler-rt/lib/sanitizer_common/scripts/gen_dynamic_list.py" + sources = [ invoker.extra ] + deps = invoker.libs + outputs = [ invoker.output ] + args = [ + "--version-list", + "--extra", + rebase_path(invoker.extra, root_build_dir), + ] + foreach(lib_name, invoker.lib_names) { + args += [ rebase_path( + "$crt_current_out_dir/libclang_rt.$lib_name$crt_current_target_suffix.a", + root_build_dir) ] + } args += [ - rebase_path( - "$crt_current_out_dir/libclang_rt.$lib_name$crt_current_target_suffix.a", - root_build_dir) - ] + "--nm-executable", + "nm", + "-o", + rebase_path(invoker.output, root_build_dir), + ] } - args += [ - "--nm-executable", - "nm", - "-o", - rebase_path(invoker.output, root_build_dir), - ] } } -- 2.7.4