From d2fa5912a44a30602e6a4b14cdb99402a4e72a42 Mon Sep 17 00:00:00 2001
From: Oliver Reiche <oliver.reiche@huawei.com>
Date: Wed, 27 Apr 2022 13:18:53 +0200
Subject: rules: Add "link-args-deps" expression

... for collecting link-args from dependencies. By
consistently using this expression, we fix an issue with C++
binary and test, which both did not collect the linker
arguments from their proto-deps.
---
 CC/test/RULES | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

(limited to 'CC/test')

diff --git a/CC/test/RULES b/CC/test/RULES
index 3f8e236..93d7706 100644
--- a/CC/test/RULES
+++ b/CC/test/RULES
@@ -61,6 +61,7 @@
     , "runfiles_list": ["./", "../..", "field_runfiles_list"]
     , "compile-deps": ["./", "..", "compile-deps"]
     , "link-deps": ["./", "..", "link-deps"]
+    , "link-args-deps": ["./", "..", "link-args-deps"]
     , "objects": ["./", "..", "objects"]
     , "default-CXX": ["./", "..", "default-CXX"]
     , "default-CXXFLAGS": ["./", "..", "default-CXXFLAGS"]
@@ -152,18 +153,7 @@
             { "type": "++"
             , "$1":
               [ {"type": "keys", "$1": {"type": "var", "name": "objects"}}
-              , { "type": "++"
-                , "$1":
-                  { "type": "foreach"
-                  , "var": "dep"
-                  , "range": {"type": "FIELD", "name": "deps"}
-                  , "body":
-                    { "type": "DEP_PROVIDES"
-                    , "dep": {"type": "var", "name": "dep"}
-                    , "provider": "link-args"
-                    }
-                  }
-                }
+              , {"type": "CALL_EXPRESSION", "name": "link-args-deps"}
               ]
             }
           }
-- 
cgit v1.2.3