[llvm] b0abada - [gn build] llvm-lipo, llvm-libtool-darwin symlink targets now dep on binary

Nico Weber via llvm-commits llvm-commits at lists.llvm.org
Mon Apr 4 06:20:56 PDT 2022


Author: Nico Weber
Date: 2022-04-04T09:20:49-04:00
New Revision: b0abada8fe7e94b1110c5abcd9ca4e0284bb2b49

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

LOG: [gn build] llvm-lipo, llvm-libtool-darwin symlink targets now dep on binary

This fixes a regression from 69cde915e923d: If llvm_install_cctools_symlinks
is false, depending llvm-lipo:symlinks didn't actually depend on llvm-lipo
and the binary didn't get built as dependency of `check-lld` (because the
`symlinks` array ended up empty).

Added: 
    

Modified: 
    llvm/utils/gn/secondary/llvm/tools/llvm-libtool-darwin/BUILD.gn
    llvm/utils/gn/secondary/llvm/tools/llvm-lipo/BUILD.gn

Removed: 
    


################################################################################
diff  --git a/llvm/utils/gn/secondary/llvm/tools/llvm-libtool-darwin/BUILD.gn b/llvm/utils/gn/secondary/llvm/tools/llvm-libtool-darwin/BUILD.gn
index 5303bbc275ad6..b4176f62d5847 100644
--- a/llvm/utils/gn/secondary/llvm/tools/llvm-libtool-darwin/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/tools/llvm-libtool-darwin/BUILD.gn
@@ -12,8 +12,9 @@ if (llvm_install_cctools_symlinks) {
 # //:llvm-libtool-darwin depends on this symlink target, see comment in
 # //BUILD.gn.
 group("symlinks") {
+  deps = [ ":llvm-libtool-darwin" ]
   if (llvm_install_cctools_symlinks) {
-    deps = [ ":libtool" ]
+    deps += [ ":libtool" ]
   }
 }
 

diff  --git a/llvm/utils/gn/secondary/llvm/tools/llvm-lipo/BUILD.gn b/llvm/utils/gn/secondary/llvm/tools/llvm-lipo/BUILD.gn
index 124231b1fb564..6530a54f083f3 100644
--- a/llvm/utils/gn/secondary/llvm/tools/llvm-lipo/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/tools/llvm-lipo/BUILD.gn
@@ -17,8 +17,9 @@ if (llvm_install_cctools_symlinks) {
 
 # //:llvm-lipo depends on this symlink target, see comment in //BUILD.gn.
 group("symlinks") {
+  deps = [ ":llvm-lipo" ]
   if (llvm_install_cctools_symlinks) {
-    deps = [ ":lipo" ]
+    deps += [ ":lipo" ]
   }
 }
 


        


More information about the llvm-commits mailing list