Merge subtree 'rules' into rules-cc

4 files changed, 6 insertions, 41 deletions

diff --git a/rules/CC/foreign/cmake/EXPRESSIONS b/rules/CC/foreign/cmake/EXPRESSIONS
index bf2385e..c8f6dc1 100644
--- a/rules/CC/foreign/cmake/EXPRESSIONS
+++ b/rules/CC/foreign/cmake/EXPRESSIONS
@@ -357,20 +357,11 @@
                       }
                     , { "type": "join"
                       , "$1":
-                        [ "export PATH=\"$(./expand_exec TOOLCHAIN -- echo "
+                        [ "export PATH="
                         , { "type": "join_cmd"
                           , "$1": [{"type": "var", "name": "PATH"}]
                           }
-                        , ")${PATH:+:}${PATH}\""
-                        ]
-                      }
-                    , { "type": "join"
-                      , "$1":
-                        [ "export PATH=\"$(./expand_exec TOOLCHAIN -- echo "
-                        , { "type": "join_cmd"
-                          , "$1": [{"type": "var", "name": "PATH"}]
-                          }
-                        , ")${PATH:+:}${PATH}\""
+                        , "${PATH:+:}\"${PATH}\""
                         ]
                       }
                     ]
diff --git a/rules/CC/foreign/make/EXPRESSIONS b/rules/CC/foreign/make/EXPRESSIONS
index bff8205..1707104 100644
--- a/rules/CC/foreign/make/EXPRESSIONS
+++ b/rules/CC/foreign/make/EXPRESSIONS
@@ -326,11 +326,11 @@
                       }
                     , { "type": "join"
                       , "$1":
-                        [ "export PATH=\"$(./expand_exec TOOLCHAIN -- echo "
+                        [ "export PATH="
                         , { "type": "join_cmd"
                           , "$1": [{"type": "var", "name": "PATH"}]
                           }
-                        , ")${PATH:+:}${PATH}\""
+                        , "${PATH:+:}\"${PATH}\""
                         ]
                       }
                     ]
diff --git a/rules/CC/foreign/shell/EXPRESSIONS b/rules/CC/foreign/shell/EXPRESSIONS
index a0a9a00..a1dcd0c 100644
--- a/rules/CC/foreign/shell/EXPRESSIONS
+++ b/rules/CC/foreign/shell/EXPRESSIONS
@@ -18,7 +18,6 @@
     , "PREFIX"
     , "BUILD_POSITION_INDEPENDENT"
     , "TIMEOUT_SCALE"
-    , "expand_exec"
     , "resolve_symlinks"
     ]
   , "imports":
@@ -316,11 +315,11 @@
                       }
                     , { "type": "join"
                       , "$1":
-                        [ "export PATH=\"$(./expand_exec TOOLCHAIN -- echo "
+                        [ "export PATH="
                         , { "type": "join_cmd"
                           , "$1": [{"type": "var", "name": "PATH"}]
                           }
-                        , ")${PATH:+:}${PATH}\""
+                        , "${PATH:+:}\"${PATH}\""
                         ]
                       }
                     ]
@@ -349,7 +348,6 @@
               , {"type": "var", "name": "work_dir"}
               , {"type": "var", "name": "localbase"}
               , {"type": "var", "name": "script"}
-              , {"type": "var", "name": "expand_exec"}
               ]
             }
           , "cmd": [{"type": "var", "name": "sh"}, "run_cmds.sh"]
diff --git a/rules/CC/foreign/shell/RULES b/rules/CC/foreign/shell/RULES
index 6a5d8ec..ed96aa3 100644
--- a/rules/CC/foreign/shell/RULES
+++ b/rules/CC/foreign/shell/RULES
@@ -30,7 +30,6 @@
     { "defaults": [["CC", "defaults"]]
     , "foreign-defaults": [["CC/foreign", "defaults"]]
     , "shell defaults": [["shell", "defaults"]]
-    , "expand_exec": [["./", "..", "expand_exec"]]
     }
   , "field_doc":
     { "project":
@@ -125,7 +124,6 @@
   , "config_transitions":
     { "defaults":
       [{"type": "empty_map"}, {"type": "CALL_EXPRESSION", "name": "for host"}]
-    , "expand_exec": [{"type": "CALL_EXPRESSION", "name": "for host"}]
     }
   , "expression":
     { "type": "let*"
@@ -186,16 +184,6 @@
             }
           }
         ]
-      , [ "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"}
-          }
-        ]
       , ["resolve_symlinks", {"type": "FIELD", "name": "resolve_symlinks"}]
       , ["artifacts", {"type": "CALL_EXPRESSION", "name": "shell-build"}]
       ]
@@ -271,7 +259,6 @@
     , "foreign-defaults": [["CC/foreign", "defaults"]]
     , "shell defaults": [["shell", "defaults"]]
     , "config_reader": [["CC", "prebuilt/read_pkgconfig.py"]]
-    , "expand_exec": [["./", "..", "expand_exec"]]
     }
   , "field_doc":
     { "project":
@@ -419,7 +406,6 @@
   , "config_transitions":
     { "defaults":
       [{"type": "empty_map"}, {"type": "CALL_EXPRESSION", "name": "for host"}]
-    , "expand_exec": [{"type": "CALL_EXPRESSION", "name": "for host"}]
     }
   , "expression":
     { "type": "let*"
@@ -555,16 +541,6 @@
       , ["cmds", {"type": "FIELD", "name": "cmds"}]
       , ["resolve_symlinks", {"type": "FIELD", "name": "resolve_symlinks"}]
       , ["defaults-transition", {"type": "empty_map"}]
-      , [ "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"}
-          }
-        ]
       , ["install_dir", {"type": "CALL_EXPRESSION", "name": "shell-build"}]
       , [ "hdrs"
         , { "type": "++"