Merge subtree 'rules' into rules-cc

2 files changed, 20 insertions, 5 deletions

diff --git a/rules/CC/foreign/shell/EXPRESSIONS b/rules/CC/foreign/shell/EXPRESSIONS
index d5f9527..2f05497 100644
--- a/rules/CC/foreign/shell/EXPRESSIONS
+++ b/rules/CC/foreign/shell/EXPRESSIONS
@@ -18,6 +18,7 @@
     , "PREFIX"
     , "BUILD_POSITION_INDEPENDENT"
     , "TIMEOUT_SCALE"
+    , "expand_exec"
     ]
   , "imports":
     { "artifacts": ["", "field_artifacts"]
@@ -31,7 +32,6 @@
     , "default-PATH": ["CC", "default-PATH"]
     , "default-TOOLCHAIN": ["CC", "default-TOOLCHAIN"]
     , "default-NON_SYSTEM_TOOLS": ["CC", "default-NON_SYSTEM_TOOLS"]
-    , "expand_exec_tool": ["./", "..", "expand_exec_tool"]
     , "foreign-MAKE": ["CC/foreign", "default-MAKE"]
     , "foreign-CMAKE": ["CC/foreign", "default-CMAKE"]
     , "foreign-PATH": ["CC/foreign", "default-PATH"]
@@ -42,10 +42,7 @@
   , "expression":
     { "type": "let*"
     , "bindings":
-      [ [ "expand_exec"
-        , {"type": "CALL_EXPRESSION", "name": "expand_exec_tool"}
-        ]
-      , ["TOOLCHAIN_DIR", "toolchain"]
+      [ ["TOOLCHAIN_DIR", "toolchain"]
       , [ "TOOLCHAIN"
         , { "type": "disjoint_map_union"
           , "msg": "Toolchain trees may not overlap"
diff --git a/rules/CC/foreign/shell/RULES b/rules/CC/foreign/shell/RULES
index fc682d5..ffffc26 100644
--- a/rules/CC/foreign/shell/RULES
+++ b/rules/CC/foreign/shell/RULES
@@ -29,6 +29,7 @@
   , "implicit":
     { "defaults": [["CC", "defaults"]]
     , "foreign-defaults": [["CC/foreign", "defaults"]]
+    , "expand_exec": [["./", "..", "expand_exec"]]
     }
   , "field_doc":
     { "project":
@@ -110,8 +111,15 @@
     }
   , "imports":
     { "artifacts": ["", "field_artifacts"]
+    , "stage_field": ["", "stage_singleton_field"]
     , "shell-build": "shell-build"
     , "install-deps": ["CC", "install-with-deps stage"]
+    , "for host": ["transitions", "for host"]
+    }
+  , "config_transitions":
+    { "defaults":
+      [{"type": "empty_map"}, {"type": "CALL_EXPRESSION", "name": "for host"}]
+    , "expand_exec": [{"type": "CALL_EXPRESSION", "name": "for host"}]
     }
   , "expression":
     { "type": "let*"
@@ -143,6 +151,16 @@
         ]
       , ["outs", {"type": "FIELD", "name": "outs"}]
       , ["out_dirs", {"type": "FIELD", "name": "out_dirs"}]
+      , [ "expand_exec"
+        , { "type": "let*"
+          , "bindings":
+            [ ["fieldname", "expand_exec"]
+            , ["location", "expand_exec"]
+            , ["transition", {"type": "CALL_EXPRESSION", "name": "for host"}]
+            ]
+          , "body": {"type": "CALL_EXPRESSION", "name": "stage_field"}
+          }
+        ]
       ]
     , "body":
       { "type": "RESULT"