[llvm] 80ce17e - [gn build] Always make symlinks target explicitly depend on base binary

[Nico Weber via llvm-commits]

Author: Nico Weber
Date: 2022-04-04T09:54:41-04:00
New Revision: 80ce17e3d477a92846be37866cde937e03cb55ac

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

LOG: [gn build] Always make symlinks target explicitly depend on base binary

This is a no-op in these files since the symlinks array is never empty
and the dependency to the base binary is added through the loop in these
cases.

But adding them doesn't hurt either, and it:
1. Makes all symlinks targets look the same, independent of symlinks
   are created always or just conditionally based on gn args
2. Makes it less likely that bugs like the one fixed by b0abada8fe7e
   are introduced by copy-pasting an existing symlink target and then
   not being careful enough when tweaking it.

No behavior change.

Added: 
    

Modified: 
    llvm/utils/gn/secondary/clang/tools/driver/BUILD.gn
    llvm/utils/gn/secondary/lld/tools/lld/BUILD.gn
    llvm/utils/gn/secondary/llvm/tools/llvm-ar/BUILD.gn
    llvm/utils/gn/secondary/llvm/tools/llvm-objcopy/BUILD.gn
    llvm/utils/gn/secondary/llvm/tools/llvm-readobj/BUILD.gn
    llvm/utils/gn/secondary/llvm/tools/llvm-symbolizer/BUILD.gn

Removed: 
    


################################################################################
diff  --git a/llvm/utils/gn/secondary/clang/tools/driver/BUILD.gn b/llvm/utils/gn/secondary/clang/tools/driver/BUILD.gn
index aad91cf59e399..8e721f2648855 100644
--- a/llvm/utils/gn/secondary/clang/tools/driver/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang/tools/driver/BUILD.gn
@@ -27,7 +27,7 @@ foreach(target, symlinks) {
 
 # //:clang depends on this symlink target, see comment in //BUILD.gn.
 group("symlinks") {
-  deps = []
+  deps = [ ":clang" ]
   foreach(target, symlinks) {
     deps += [ ":${target[0]}" ]
   }

diff  --git a/llvm/utils/gn/secondary/lld/tools/lld/BUILD.gn b/llvm/utils/gn/secondary/lld/tools/lld/BUILD.gn
index 87f4fb5511a83..d6935c0dba083 100644
--- a/llvm/utils/gn/secondary/lld/tools/lld/BUILD.gn
+++ b/llvm/utils/gn/secondary/lld/tools/lld/BUILD.gn
@@ -16,7 +16,7 @@ foreach(target, symlinks) {
 
 # //:lld depends on this symlink target, see comment in //BUILD.gn.
 group("symlinks") {
-  deps = []
+  deps = [ ":lld" ]
   foreach(target, symlinks) {
     deps += [ ":$target" ]
   }

diff  --git a/llvm/utils/gn/secondary/llvm/tools/llvm-ar/BUILD.gn b/llvm/utils/gn/secondary/llvm/tools/llvm-ar/BUILD.gn
index db8c2f09a138a..9d4ae2cbf8a1d 100644
--- a/llvm/utils/gn/secondary/llvm/tools/llvm-ar/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/tools/llvm-ar/BUILD.gn
@@ -23,7 +23,7 @@ foreach(target, symlinks) {
 
 # //:llvm-ar depends on this symlink target, see comment in //BUILD.gn.
 group("symlinks") {
-  deps = []
+  deps = [ ":llvm-ar" ]
   foreach(target, symlinks) {
     deps += [ ":$target" ]
   }

diff  --git a/llvm/utils/gn/secondary/llvm/tools/llvm-objcopy/BUILD.gn b/llvm/utils/gn/secondary/llvm/tools/llvm-objcopy/BUILD.gn
index da4739e13dc40..01df0df335ab9 100644
--- a/llvm/utils/gn/secondary/llvm/tools/llvm-objcopy/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/tools/llvm-objcopy/BUILD.gn
@@ -50,7 +50,7 @@ foreach(target, symlinks) {
 
 # //:llvm-objcopy depends on this symlink target, see comment in //BUILD.gn.
 group("symlinks") {
-  deps = []
+  deps = [ ":llvm-objcopy" ]
   foreach(target, symlinks) {
     deps += [ ":$target" ]
   }

diff  --git a/llvm/utils/gn/secondary/llvm/tools/llvm-readobj/BUILD.gn b/llvm/utils/gn/secondary/llvm/tools/llvm-readobj/BUILD.gn
index ca6e71bd81c2d..921cc1dc72f18 100644
--- a/llvm/utils/gn/secondary/llvm/tools/llvm-readobj/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/tools/llvm-readobj/BUILD.gn
@@ -21,7 +21,7 @@ foreach(target, symlinks) {
 
 # //:llvm-readobj depends on this symlink target, see comment in //BUILD.gn.
 group("symlinks") {
-  deps = []
+  deps = [ ":llvm-readobj" ]
   foreach(target, symlinks) {
     deps += [ ":$target" ]
   }

diff  --git a/llvm/utils/gn/secondary/llvm/tools/llvm-symbolizer/BUILD.gn b/llvm/utils/gn/secondary/llvm/tools/llvm-symbolizer/BUILD.gn
index 0fafd0aadce61..ef94d0075e19d 100644
--- a/llvm/utils/gn/secondary/llvm/tools/llvm-symbolizer/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/tools/llvm-symbolizer/BUILD.gn
@@ -21,7 +21,7 @@ foreach(target, symlinks) {
 
 # //:llvm-symbolizer depends on this symlink target, see comment in //BUILD.gn.
 group("symlinks") {
-  deps = []
+  deps = [ ":llvm-symbolizer" ]
   foreach(target, symlinks) {
     deps += [ ":$target" ]
   }