gn build: Merge r358749

Since the symlinks list for llvm-symbolizer is now never empty,
the :symlinks target no longer needs an explicit dep on :llvm-symbolizer
-- there will be at least one dep on a symlink, and each symlink depends
on :llvm-symbolizer already.

Since llvm-symbolizer:symlinks now produces symlinks that check-llvm
uses, make llvm/test depend on the symlink target.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@358861 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/utils/gn/secondary/llvm/test/BUILD.gn b/utils/gn/secondary/llvm/test/BUILD.gn
index 25e8ca43e35f5664064cb4b41f2c4571b7440316..c8871e0400b3a5ef4839b2ce279e2b4c4316ea27 100644 (file)
--- a/utils/gn/secondary/llvm/test/BUILD.gn
+++ b/utils/gn/secondary/llvm/test/BUILD.gn
@@ -227,7 +227,7 @@ group("test") {
     "//llvm/tools/llvm-size",
     "//llvm/tools/llvm-split",
     "//llvm/tools/llvm-strings",
-    "//llvm/tools/llvm-symbolizer",
+    "//llvm/tools/llvm-symbolizer:symlinks",
     "//llvm/tools/llvm-undname",
     "//llvm/tools/llvm-xray",
     "//llvm/tools/lto",

diff --git a/utils/gn/secondary/llvm/tools/llvm-objdump/BUILD.gn b/utils/gn/secondary/llvm/tools/llvm-objdump/BUILD.gn
index e567a70d0a8b801bba1ea0a437066d461cbdcf7c..2b1b0917e760fa12eef471d4924f86b44699378f 100644 (file)
--- a/utils/gn/secondary/llvm/tools/llvm-objdump/BUILD.gn
+++ b/utils/gn/secondary/llvm/tools/llvm-objdump/BUILD.gn
@@ -11,7 +11,7 @@ if (llvm_install_binutils_symlinks) {
   }
 }
 
-# //:llvm-nm depends on this symlink target, see comment in //BUILD.gn.
+# //:llvm-objdump depends on this symlink target, see comment in //BUILD.gn.
 group("symlinks") {
   deps = [
     ":llvm-objdump",

diff --git a/utils/gn/secondary/llvm/tools/llvm-symbolizer/BUILD.gn b/utils/gn/secondary/llvm/tools/llvm-symbolizer/BUILD.gn
index 497d2c8284bed06af325d6ad101ca4967d04c9f9..34e4e41b9c81319a35c8e9d29973138c7a93b564 100644 (file)
--- a/utils/gn/secondary/llvm/tools/llvm-symbolizer/BUILD.gn
+++ b/utils/gn/secondary/llvm/tools/llvm-symbolizer/BUILD.gn
@@ -1,23 +1,25 @@
 import("//llvm/tools/binutils_symlinks.gni")
 import("//llvm/utils/gn/build/symlink_or_copy.gni")
 
+symlinks = [ "llvm-addr2line" ]
 if (llvm_install_binutils_symlinks) {
-  symlink_or_copy("addr2line") {
+  symlinks += [ "addr2line" ]
+}
+foreach(target, symlinks) {
+  symlink_or_copy(target) {
     deps = [
       ":llvm-symbolizer",
     ]
     source = "llvm-symbolizer"
-    output = "$root_out_dir/bin/addr2line"
+    output = "$root_out_dir/bin/$target"
   }
 }
 
 # //:llvm-symbolizer depends on this symlink target, see comment in //BUILD.gn.
 group("symlinks") {
-  deps = [
-    ":llvm-symbolizer",
-  ]
-  if (llvm_install_binutils_symlinks) {
-    deps += [ ":addr2line" ]
+  deps = []
+  foreach(target, symlinks) {
+    deps += [ ":$target" ]
   }
 }