Merge subtree 'rules' into rules-cc

2 files changed, 24 insertions, 17 deletions

diff --git a/rules/CC/foreign/cmake/EXPRESSIONS b/rules/CC/foreign/cmake/EXPRESSIONS
index 6865e7c..5397e9f 100644
--- a/rules/CC/foreign/cmake/EXPRESSIONS
+++ b/rules/CC/foreign/cmake/EXPRESSIONS
@@ -23,7 +23,7 @@
     , "AR"
     , "BUILD_POSITION_INDEPENDENT"
     , "defaults-transition"
-    , "host-defaults-transition"
+    , "expand_exec"
     ]
   , "imports":
     { "artifacts": ["", "field_artifacts"]
@@ -38,7 +38,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-ENV": ["CC/foreign", "default-ENV"]
@@ -49,17 +48,7 @@
   , "expression":
     { "type": "let*"
     , "bindings":
-      [ [ "expand_exec"
-        , { "type": "let*"
-          , "bindings":
-            [ [ "defaults-transition"
-              , {"type": "var", "name": "host-defaults-transition"}
-              ]
-            ]
-          , "body": {"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/cmake/RULES b/rules/CC/foreign/cmake/RULES
index 5f7c4f8..b36bc73 100644
--- a/rules/CC/foreign/cmake/RULES
+++ b/rules/CC/foreign/cmake/RULES
@@ -38,6 +38,7 @@
   , "implicit":
     { "defaults": [["CC", "defaults"]]
     , "foreign-defaults": [["CC/foreign", "defaults"]]
+    , "expand_exec": [["./", "..", "expand_exec"]]
     }
   , "field_doc":
     { "project":
@@ -156,6 +157,7 @@
   , "config_transitions":
     { "defaults":
       [{"type": "empty_map"}, {"type": "CALL_EXPRESSION", "name": "for host"}]
+    , "expand_exec": [{"type": "CALL_EXPRESSION", "name": "for host"}]
     }
   , "expression":
     { "type": "let*"
@@ -203,8 +205,15 @@
       , ["pre_cmds", {"type": "FIELD", "name": "pre_cmds"}]
       , ["post_cmds", {"type": "FIELD", "name": "post_cmds"}]
       , ["defaults-transition", {"type": "empty_map"}]
-      , [ "host-defaults-transition"
-        , {"type": "CALL_EXPRESSION", "name": "for host"}
+      , [ "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"}
+          }
         ]
       , [ "full_install_dir"
         , {"type": "CALL_EXPRESSION", "name": "cmake-build"}
@@ -303,6 +312,7 @@
     { "defaults": [["CC", "defaults"]]
     , "foreign-defaults": [["CC/foreign", "defaults"]]
     , "config_reader": [["CC", "prebuilt/read_pkgconfig.py"]]
+    , "expand_exec": [["./", "..", "expand_exec"]]
     }
   , "field_doc":
     { "project":
@@ -462,6 +472,7 @@
   , "config_transitions":
     { "defaults":
       [{"type": "empty_map"}, {"type": "CALL_EXPRESSION", "name": "for host"}]
+    , "expand_exec": [{"type": "CALL_EXPRESSION", "name": "for host"}]
     }
   , "expression":
     { "type": "let*"
@@ -597,8 +608,15 @@
       , ["pre_cmds", {"type": "FIELD", "name": "pre_cmds"}]
       , ["post_cmds", {"type": "FIELD", "name": "post_cmds"}]
       , ["defaults-transition", {"type": "empty_map"}]
-      , [ "host-defaults-transition"
-        , {"type": "CALL_EXPRESSION", "name": "for host"}
+      , [ "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"}
+          }
         ]
       , [ "full_install_dir"
         , {"type": "CALL_EXPRESSION", "name": "cmake-build"}