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/RULES | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

(limited to 'CC/RULES')

diff --git a/CC/RULES b/CC/RULES
index 0c87721..cb13f98 100644
--- a/CC/RULES
+++ b/CC/RULES
@@ -406,6 +406,7 @@
     { "artifacts": ["./", "..", "field_artifacts"]
     , "compile-deps": "compile-deps"
     , "link-deps": "link-deps"
+    , "link-args-deps": "link-args-deps"
     , "objects": "objects"
     , "compiler": "compiler"
     , "flags": "flags"
@@ -500,18 +501,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"}
               , {"type": "FIELD", "name": "link external"}
               ]
             }
-- 
cgit v1.2.3