From 0d0f1172087fc52edb64dad58a4a3a76f41e37c0 Mon Sep 17 00:00:00 2001
From: Oliver Reiche <oliver.reiche@huawei.com>
Date: Tue, 25 Apr 2023 11:05:14 +0200
Subject: rules: Fix propagation of PATH for protoc

---
 CC/proto/EXPRESSIONS | 9 +++++++++
 CC/proto/RULES       | 1 +
 2 files changed, 10 insertions(+)

diff --git a/CC/proto/EXPRESSIONS b/CC/proto/EXPRESSIONS
index 118c41a..6f51496 100644
--- a/CC/proto/EXPRESSIONS
+++ b/CC/proto/EXPRESSIONS
@@ -153,6 +153,14 @@
             }
           }
         ]
+      , [ "protoc-ENV"
+        , { "type": "map_union"
+          , "$1":
+            [ {"type": "CALL_EXPRESSION", "name": "default-ENV"}
+            , {"type": "var", "name": "ENV", "default": {"type": "empty_map"}}
+            ]
+          }
+        ]
       , ["protoc-deps", {"type": "CALL_EXPRESSION", "name": "protoc-deps"}]
       , [ "proto srcs"
         , { "type": "disjoint_map_union"
@@ -258,6 +266,7 @@
             }
           , "outs": {"type": "var", "name": "outs"}
           , "cmd": {"type": "var", "name": "cmd"}
+          , "env": {"type": "var", "name": "protoc-ENV"}
           }
         ]
       , [ "srcs"
diff --git a/CC/proto/RULES b/CC/proto/RULES
index 8a0711e..c6568cd 100644
--- a/CC/proto/RULES
+++ b/CC/proto/RULES
@@ -99,6 +99,7 @@
           }
         ]
       , ["provider", "ENV"]
+      , ["default", {"type": "empty_map"}]
       , [ "ENV"
         , { "type": "if"
           , "cond": {"type": "var", "name": "PATH"}
-- 
cgit v1.2.3