[llvm] ee21411 - gn build: Don't define an action for gen_version_script on mac/win.

Peter Collingbourne via llvm-commits llvm-commits at lists.llvm.org
Mon Jun 13 13:55:17 PDT 2022


Author: Peter Collingbourne
Date: 2022-06-13T13:54:57-07:00
New Revision: ee21411107aa18e191a25380b9e4679f3909a0c7

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

LOG: 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

Added: 
    

Modified: 
    llvm/utils/gn/secondary/compiler-rt/gen_version_script.gni

Removed: 
    


################################################################################
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 ebbf64b8c5f4..5b5ffe3318c5 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),
-    ]
   }
 }


        


More information about the llvm-commits mailing list