From 6f404766c89fb48c4fc871d2ccb273bc5d5b2e5e Mon Sep 17 00:00:00 2001
From: Oliver Reiche <oliver.reiche@huawei.com>
Date: Mon, 19 Sep 2022 14:13:02 +0200
Subject: rules: Use new 'env' expression

---
 CC/EXPRESSIONS | 13 +------------
 CC/RULES       | 29 ++---------------------------
 2 files changed, 3 insertions(+), 39 deletions(-)

(limited to 'CC')

diff --git a/CC/EXPRESSIONS b/CC/EXPRESSIONS
index 48f40a2..5153b2d 100644
--- a/CC/EXPRESSIONS
+++ b/CC/EXPRESSIONS
@@ -506,18 +506,7 @@
       , "provides":
         { "type": "map_union"
         , "$1":
-          [ { "type": "singleton_map"
-            , "key": "compile-deps"
-            , "value": {"type": "var", "name": "compile-deps"}
-            }
-          , { "type": "singleton_map"
-            , "key": "link-deps"
-            , "value": {"type": "var", "name": "link-deps"}
-            }
-          , { "type": "singleton_map"
-            , "key": "link-args"
-            , "value": {"type": "var", "name": "link-args"}
-            }
+          [ {"type": "env", "vars": ["compile-deps", "link-deps", "link-args"]}
           , { "type": "var"
             , "name": "extra-provides"
             , "default": {"type": "empty_map"}
diff --git a/CC/RULES b/CC/RULES
index 6fdab85..ac81da2 100644
--- a/CC/RULES
+++ b/CC/RULES
@@ -103,33 +103,8 @@
     , "body":
       { "type": "RESULT"
       , "provides":
-        { "type": "map_union"
-        , "$1":
-          [ { "type": "singleton_map"
-            , "key": "CC"
-            , "value": {"type": "var", "name": "CC"}
-            }
-          , { "type": "singleton_map"
-            , "key": "CXX"
-            , "value": {"type": "var", "name": "CXX"}
-            }
-          , { "type": "singleton_map"
-            , "key": "CFLAGS"
-            , "value": {"type": "var", "name": "CFLAGS"}
-            }
-          , { "type": "singleton_map"
-            , "key": "CXXFLAGS"
-            , "value": {"type": "var", "name": "CXXFLAGS"}
-            }
-          , { "type": "singleton_map"
-            , "key": "AR"
-            , "value": {"type": "var", "name": "AR"}
-            }
-          , { "type": "singleton_map"
-            , "key": "ENV"
-            , "value": {"type": "var", "name": "ENV"}
-            }
-          ]
+        { "type": "env"
+        , "vars": ["CC", "CXX", "CFLAGS", "CXXFLAGS", "AR", "ENV"]
         }
       }
     }
-- 
cgit v1.2.3