1 files changed, 27 insertions, 30 deletions
diff --git a/rules/CC/proto/RULES b/rules/CC/proto/RULES
index d53ab35e..d1cfc4e5 100644
--- a/rules/CC/proto/RULES
+++ b/rules/CC/proto/RULES
@@ -8,25 +8,12 @@
   , "string_fields": ["name", "stage"]
   , "target_fields": ["srcs", "deps"]
   , "config_vars":
-    [ "OS"
-    , "ARCH"
-    , "HOST_ARCH"
-    , "CXX"
-    , "CC"
-    , "CXXFLAGS"
-    , "CFLAGS"
-    , "ADD_CXXFLAGS"
-    , "ADD_CFLAGS"
-    , "ENV"
-    , "AR"
-    ]
+    ["OS", "ARCH", "HOST_ARCH", "CXX", "CFLAGS", "ADD_CFLAGS", "AR", "ENV"]
   , "implicit":
     { "protoc": [["@", "protoc", "", "protoc"]]
     , "defaults": [["./", "..", "defaults"]]
     , "proto-deps": [["@", "protoc", "", "C++ runtime"]]
     , "well_known_protos": [["@", "protoc", "", "well_known_protos"]]
-    , "pure C": []
-    , "private-deps": []
     }
   , "imports":
     { "protoc-compile": "protoc-compile"
@@ -37,7 +24,19 @@
   , "expression":
     { "type": "let*"
     , "bindings":
-      [["transition", {"type": "CALL_EXPRESSION", "name": "host transition"}]]
+      [ ["name", {"type": "join", "$1": {"type": "FIELD", "name": "name"}}]
+      , [ "stage"
+        , { "type": "join"
+          , "separator": "/"
+          , "$1": {"type": "FIELD", "name": "stage"}
+          }
+        ]
+      , [ "deps-transition"
+        , {"type": "CALL_EXPRESSION", "name": "host transition"}
+        ]
+      , ["public-fieldnames", ["deps", "proto-deps"]]
+      , ["private-fieldnames", ["deps", "proto-deps"]]
+      ]
     , "body": {"type": "CALL_EXPRESSION", "name": "protoc-compile"}
     }
   }
@@ -51,18 +50,7 @@
   , "string_fields": ["name", "stage"]
   , "target_fields": ["srcs", "deps"]
   , "config_vars":
-    [ "OS"
-    , "ARCH"
-    , "HOST_ARCH"
-    , "CXX"
-    , "CC"
-    , "CXXFLAGS"
-    , "CFLAGS"
-    , "ADD_CXXFLAGS"
-    , "ADD_CFLAGS"
-    , "ENV"
-    , "AR"
-    ]
+    ["OS", "ARCH", "HOST_ARCH", "CXX", "CXXFLAGS", "ADD_CXXFLAGS", "AR", "ENV"]
   , "implicit":
     { "protoc": [["@", "protoc", "", "protoc"]]
     , "grpc_cpp_plugin": [["@", "grpc", "src/compiler", "grpc_cpp_plugin"]]
@@ -72,8 +60,6 @@
       , ["@", "protoc", "", "C++ runtime"]
       ]
     , "well_known_protos": [["@", "protoc", "", "well_known_protos"]]
-    , "pure C": []
-    , "private-deps": []
     }
   , "imports":
     { "protoc-compile": "protoc-compile"
@@ -88,7 +74,18 @@
     { "type": "let*"
     , "bindings":
       [ ["service support", true]
-      , ["transition", {"type": "CALL_EXPRESSION", "name": "host transition"}]
+      , ["name", {"type": "join", "$1": {"type": "FIELD", "name": "name"}}]
+      , [ "stage"
+        , { "type": "join"
+          , "separator": "/"
+          , "$1": {"type": "FIELD", "name": "stage"}
+          }
+        ]
+      , [ "deps-transition"
+        , {"type": "CALL_EXPRESSION", "name": "host transition"}
+        ]
+      , ["public-fieldnames", ["deps", "proto-deps"]]
+      , ["private-fieldnames", ["deps", "proto-deps"]]
       ]
     , "body": {"type": "CALL_EXPRESSION", "name": "protoc-compile"}
     }