rules: Support for external toolchains

4 files changed, 424 insertions, 59 deletions

diff --git a/rules/CC/EXPRESSIONS b/rules/CC/EXPRESSIONS
index fd90914f..cad28e8c 100644
--- a/rules/CC/EXPRESSIONS
+++ b/rules/CC/EXPRESSIONS
@@ -2,54 +2,45 @@
   { "vars": ["defaults-transition"]
   , "imports": {"list_provider": ["./", "..", "field_list_provider"]}
   , "expression":
-    { "type": "join"
-    , "$1":
-      { "type": "let*"
-      , "bindings":
-        [ ["fieldname", "defaults"]
-        , ["provider", "CC"]
-        , [ "transition"
-          , {"type": "var", "name": "defaults-transition", "default": null}
-          ]
+    { "type": "let*"
+    , "bindings":
+      [ ["fieldname", "defaults"]
+      , ["provider", "CC"]
+      , [ "transition"
+        , {"type": "var", "name": "defaults-transition", "default": null}
         ]
-      , "body": {"type": "CALL_EXPRESSION", "name": "list_provider"}
-      }
+      ]
+    , "body": {"type": "CALL_EXPRESSION", "name": "list_provider"}
     }
   }
 , "default-CXX":
   { "vars": ["defaults-transition"]
   , "imports": {"list_provider": ["./", "..", "field_list_provider"]}
   , "expression":
-    { "type": "join"
-    , "$1":
-      { "type": "let*"
-      , "bindings":
-        [ ["fieldname", "defaults"]
-        , ["provider", "CXX"]
-        , [ "transition"
-          , {"type": "var", "name": "defaults-transition", "default": null}
-          ]
+    { "type": "let*"
+    , "bindings":
+      [ ["fieldname", "defaults"]
+      , ["provider", "CXX"]
+      , [ "transition"
+        , {"type": "var", "name": "defaults-transition", "default": null}
         ]
-      , "body": {"type": "CALL_EXPRESSION", "name": "list_provider"}
-      }
+      ]
+    , "body": {"type": "CALL_EXPRESSION", "name": "list_provider"}
     }
   }
 , "default-AR":
   { "vars": ["defaults-transition"]
   , "imports": {"list_provider": ["./", "..", "field_list_provider"]}
   , "expression":
-    { "type": "join"
-    , "$1":
-      { "type": "let*"
-      , "bindings":
-        [ ["fieldname", "defaults"]
-        , ["provider", "AR"]
-        , [ "transition"
-          , {"type": "var", "name": "defaults-transition", "default": null}
-          ]
+    { "type": "let*"
+    , "bindings":
+      [ ["fieldname", "defaults"]
+      , ["provider", "AR"]
+      , [ "transition"
+        , {"type": "var", "name": "defaults-transition", "default": null}
         ]
-      , "body": {"type": "CALL_EXPRESSION", "name": "list_provider"}
-      }
+      ]
+    , "body": {"type": "CALL_EXPRESSION", "name": "list_provider"}
     }
   }
 , "default-CFLAGS":
@@ -82,6 +73,21 @@
     , "body": {"type": "CALL_EXPRESSION", "name": "list_provider"}
     }
   }
+, "default-LDFLAGS":
+  { "vars": ["defaults-transition"]
+  , "imports": {"list_provider": ["./", "..", "field_list_provider"]}
+  , "expression":
+    { "type": "let*"
+    , "bindings":
+      [ ["fieldname", "defaults"]
+      , ["provider", "LDFLAGS"]
+      , [ "transition"
+        , {"type": "var", "name": "defaults-transition", "default": null}
+        ]
+      ]
+    , "body": {"type": "CALL_EXPRESSION", "name": "list_provider"}
+    }
+  }
 , "default-ENV":
   { "vars": ["defaults-transition"]
   , "imports": {"map_provider": ["./", "..", "field_map_provider"]}
@@ -98,11 +104,51 @@
     , "body": {"type": "CALL_EXPRESSION", "name": "map_provider"}
     }
   }
+, "default-TOOLCHAIN":
+  { "vars": ["defaults-transition"]
+  , "imports": {"map_provider": ["./", "..", "field_map_provider"]}
+  , "expression":
+    { "type": "let*"
+    , "bindings":
+      [ ["fieldname", "defaults"]
+      , ["provider", "TOOLCHAIN"]
+      , [ "transition"
+        , {"type": "var", "name": "defaults-transition", "default": null}
+        ]
+      , ["default", {"type": "empty_map"}]
+      ]
+    , "body": {"type": "CALL_EXPRESSION", "name": "map_provider"}
+    }
+  }
+, "default-NON_SYSTEM_TOOLS":
+  { "vars": ["defaults-transition"]
+  , "expression":
+    { "type": "map_union"
+    , "$1":
+      { "type": "foreach"
+      , "var": "x"
+      , "range": {"type": "FIELD", "name": "defaults"}
+      , "body":
+        { "type": "DEP_PROVIDES"
+        , "dep": {"type": "var", "name": "x"}
+        , "provider": "NON_SYSTEM_TOOLS"
+        , "transition":
+          { "type": "var"
+          , "name": "defaults-transition"
+          , "default": {"type": "empty_map"}
+          }
+        , "default": {"type": "empty_map"}
+        }
+      }
+    }
+  }
 , "defaults-base-provides":
   { "doc": ["Query list-provider from 'base' targets (last wins)"]
   , "vars": ["provider", "default"]
   , "vars_doc":
-    {"provider": ["The name of the list-provider in the provides map."]}
+    { "provider": ["The name of the list-provider in the provides map."]
+    , "default": ["The default if provider is missing (default: [])."]
+    }
   , "imports": {"provider_list": ["./", "..", "field_provider_list"]}
   , "expression":
     { "type": "let*"
@@ -508,6 +554,7 @@
     [ "COMPILER"
     , "COMPILE_FLAGS"
     , "ENV"
+    , "TOOLCHAIN"
     , "srcs"
     , "hdrs"
     , "private-hdrs"
@@ -570,6 +617,10 @@
                     , "name": "cflags-files"
                     , "default": {"type": "empty_map"}
                     }
+                  , { "type": "var"
+                    , "name": "TOOLCHAIN"
+                    , "default": {"type": "empty_map"}
+                    }
                   ]
                 }
               ]
@@ -628,25 +679,64 @@
     }
   }
 , "compiler-cc":
-  { "vars": ["CC", "defaults-transition"]
+  { "vars": ["CC", "TOOLCHAIN_DIR", "NON_SYSTEM_TOOLS", "defaults-transition"]
   , "imports": {"default-CC": "default-CC"}
   , "expression":
     { "type": "var"
     , "name": "CC"
-    , "default": {"type": "CALL_EXPRESSION", "name": "default-CC"}
+    , "default":
+      { "type": "join"
+      , "$1":
+        { "type": "++"
+        , "$1":
+          [ { "type": "if"
+            , "cond":
+              { "type": "lookup"
+              , "key": "CC"
+              , "map": {"type": "var", "name": "NON_SYSTEM_TOOLS"}
+              }
+            , "then": ["./", {"type": "var", "name": "TOOLCHAIN_DIR"}, "/"]
+            }
+          , {"type": "CALL_EXPRESSION", "name": "default-CC"}
+          ]
+        }
+      }
     }
   }
 , "compiler-cxx":
-  { "vars": ["CXX", "defaults-transition"]
+  { "vars": ["CXX", "TOOLCHAIN_DIR", "NON_SYSTEM_TOOLS", "defaults-transition"]
   , "imports": {"default-CXX": "default-CXX"}
   , "expression":
     { "type": "var"
     , "name": "CXX"
-    , "default": {"type": "CALL_EXPRESSION", "name": "default-CXX"}
+    , "default":
+      { "type": "join"
+      , "$1":
+        { "type": "++"
+        , "$1":
+          [ { "type": "if"
+            , "cond":
+              { "type": "lookup"
+              , "key": "CXX"
+              , "map": {"type": "var", "name": "NON_SYSTEM_TOOLS"}
+              }
+            , "then": ["./", {"type": "var", "name": "TOOLCHAIN_DIR"}, "/"]
+            }
+          , {"type": "CALL_EXPRESSION", "name": "default-CXX"}
+          ]
+        }
+      }
     }
   }
 , "compiler":
-  { "vars": ["CC", "CXX", "pure C", "defaults-transition"]
+  { "vars":
+    [ "CC"
+    , "CXX"
+    , "pure C"
+    , "TOOLCHAIN_DIR"
+    , "NON_SYSTEM_TOOLS"
+    , "defaults-transition"
+    ]
   , "imports": {"compiler-cc": "compiler-cc", "compiler-cxx": "compiler-cxx"}
   , "expression":
     { "type": "if"
@@ -727,11 +817,24 @@
     , "objects": "objects"
     , "default-AR": "default-AR"
     , "default-ENV": "default-ENV"
+    , "default-TOOLCHAIN": "default-TOOLCHAIN"
+    , "default-NON_SYSTEM_TOOLS": "default-NON_SYSTEM_TOOLS"
     }
   , "expression":
     { "type": "let*"
     , "bindings":
-      [ ["COMPILER", {"type": "CALL_EXPRESSION", "name": "compiler"}]
+      [ ["TOOLCHAIN_DIR", "toolchain"]
+      , ["TOOLCHAIN", {"type": "CALL_EXPRESSION", "name": "default-TOOLCHAIN"}]
+      , [ "TOOLCHAIN"
+        , { "type": "to_subdir"
+          , "subdir": {"type": "var", "name": "TOOLCHAIN_DIR"}
+          , "$1": {"type": "var", "name": "TOOLCHAIN"}
+          }
+        ]
+      , [ "NON_SYSTEM_TOOLS"
+        , {"type": "CALL_EXPRESSION", "name": "default-NON_SYSTEM_TOOLS"}
+        ]
+      , ["COMPILER", {"type": "CALL_EXPRESSION", "name": "compiler"}]
       , [ "COMPILE_FLAGS"
         , { "type": "++"
           , "$1":
@@ -743,7 +846,24 @@
       , [ "AR"
         , { "type": "var"
           , "name": "AR"
-          , "default": {"type": "CALL_EXPRESSION", "name": "default-AR"}
+          , "default":
+            { "type": "join"
+            , "$1":
+              { "type": "++"
+              , "$1":
+                [ { "type": "if"
+                  , "cond":
+                    { "type": "lookup"
+                    , "key": "AR"
+                    , "map": {"type": "var", "name": "NON_SYSTEM_TOOLS"}
+                    }
+                  , "then":
+                    ["./", {"type": "var", "name": "TOOLCHAIN_DIR"}, "/"]
+                  }
+                , {"type": "CALL_EXPRESSION", "name": "default-AR"}
+                ]
+              }
+            }
           }
         ]
       , [ "ENV"
@@ -792,7 +912,13 @@
           , "then":
             { "type": "ACTION"
             , "outs": [{"type": "var", "name": "libpath"}]
-            , "inputs": {"type": "var", "name": "objects"}
+            , "inputs":
+              { "type": "map_union"
+              , "$1":
+                [ {"type": "var", "name": "TOOLCHAIN"}
+                , {"type": "var", "name": "objects"}
+                ]
+              }
             , "env":
               {"type": "var", "name": "ENV", "default": {"type": "empty_map"}}
             , "cmd":
@@ -959,11 +1085,25 @@
     , "flags": "flags"
     , "objects": "objects"
     , "default-ENV": "default-ENV"
+    , "default-LDFLAGS": "default-LDFLAGS"
+    , "default-TOOLCHAIN": "default-TOOLCHAIN"
+    , "default-NON_SYSTEM_TOOLS": "default-NON_SYSTEM_TOOLS"
     }
   , "expression":
     { "type": "let*"
     , "bindings":
-      [ ["COMPILER", {"type": "CALL_EXPRESSION", "name": "compiler"}]
+      [ ["TOOLCHAIN_DIR", "toolchain"]
+      , ["TOOLCHAIN", {"type": "CALL_EXPRESSION", "name": "default-TOOLCHAIN"}]
+      , [ "TOOLCHAIN"
+        , { "type": "to_subdir"
+          , "subdir": {"type": "var", "name": "TOOLCHAIN_DIR"}
+          , "$1": {"type": "var", "name": "TOOLCHAIN"}
+          }
+        ]
+      , [ "NON_SYSTEM_TOOLS"
+        , {"type": "CALL_EXPRESSION", "name": "default-NON_SYSTEM_TOOLS"}
+        ]
+      , ["COMPILER", {"type": "CALL_EXPRESSION", "name": "compiler"}]
       , [ "COMPILE_FLAGS"
         , { "type": "++"
           , "$1":
@@ -972,6 +1112,7 @@
             ]
           }
         ]
+      , ["LDFLAGS", {"type": "CALL_EXPRESSION", "name": "default-LDFLAGS"}]
       , [ "ENV"
         , { "type": "map_union"
           , "$1":
@@ -1013,7 +1154,8 @@
           , "inputs":
             { "type": "disjoint_map_union"
             , "$1":
-              [ {"type": "var", "name": "objects"}
+              [ {"type": "var", "name": "TOOLCHAIN"}
+              , {"type": "var", "name": "objects"}
               , {"type": "var", "name": "link-deps"}
               , { "type": "var"
                 , "name": "cflags-files"
@@ -1034,6 +1176,7 @@
                 ]
               , {"type": "var", "name": "COMPILE_FLAGS"}
               , {"type": "var", "name": "link-args"}
+              , {"type": "var", "name": "LDFLAGS"}
               ]
             }
           , "env": {"type": "var", "name": "ENV"}
diff --git a/rules/CC/RULES b/rules/CC/RULES
index 63be910f..57cde505 100644
--- a/rules/CC/RULES
+++ b/rules/CC/RULES
@@ -6,18 +6,83 @@
     , "use of this rule. As targets form a different root, the defaults"
     , "can be provided without changing this directory."
     ]
-  , "target_fields": ["base"]
+  , "target_fields": ["base", "toolchain", "deps"]
   , "string_fields":
     [ "CC"
     , "CXX"
     , "CFLAGS"
     , "CXXFLAGS"
+    , "LDFLAGS"
     , "ADD_CFLAGS"
     , "ADD_CXXFLAGS"
+    , "ADD_LDFLAGS"
     , "AR"
     , "PATH"
+    , "SYSTEM_TOOLS"
     ]
-  , "imports": {"base-provides": "defaults-base-provides"}
+  , "field_doc":
+    { "base": ["Other targets (using the same rule) to inherit values from."]
+    , "toolchain":
+      [ "Optional toolchain directory. A collection of artifacts that provide"
+      , "the tools CC, CXX, and AR (if needed). Note that only artifacts of"
+      , "the specified targets are considered (no runfiles etc.). Specifying"
+      , "this field overlays artifacts from \"base\"."
+      ]
+    , "deps":
+      [ "Optional CC libraries any CC library and CC binary implicitly depend"
+      , "on. Those are typically \"libstdc++\" or \"libc++\" for C++ targets."
+      , "Specifying this field extends dependencies from \"base\"."
+      ]
+    , "CC": ["The C compiler to use"]
+    , "CXX": ["The C++ compiler to use"]
+    , "AR": ["The archiver tool to use"]
+    , "SYSTEM_TOOLS":
+      [ "List of tools (\"CC\", \"CXX\", or \"AR\") that should be taken from"
+      , "the system instead of from \"toolchain\" (if specified)."
+      ]
+    , "CFLAGS":
+      [ "Flags for C compilation. Specifying this field overwrites"
+      , "values from \"base\"."
+      ]
+    , "CXXFLAGS":
+      [ "Flags for C++ compilation. Specifying this field overwrites"
+      , "values from \"base\"."
+      ]
+    , "LDFLAGS":
+      [ "Linker flags for linking the final CC library. Specifying this field"
+      , "overwrites values from \"base\"."
+      ]
+    , "ADD_CFLAGS":
+      [ "Additional compilation flags for C. Specifying this field"
+      , "extends values from \"base\"."
+      ]
+    , "ADD_CXXFLAGS":
+      [ "Additional compilation flags for C++. Specifying this field"
+      , "extends values from \"base\"."
+      ]
+    , "ADD_LDFLAGS":
+      [ "Additional linker flags for linking the final CC library. Specifying"
+      , "this field extends values from \"base\"."
+      ]
+    , "PATH":
+      [ "Path for looking up the compilers. Individual paths are joined"
+      , "with \":\"."
+      ]
+    }
+  , "config_vars": ["ARCH", "HOST_ARCH"]
+  , "imports":
+    { "base-provides": "defaults-base-provides"
+    , "artifacts": ["./", "..", "field_artifacts"]
+    , "compile-deps": "compile-deps"
+    , "compile-args-deps": "compile-args-deps"
+    , "link-deps": "link-deps"
+    , "link-args-deps": "link-args-deps"
+    , "cflags-files-deps": "cflags-files-deps"
+    , "ldflags-files-deps": "ldflags-files-deps"
+    , "for host": ["transitions", "for host"]
+    }
+  , "config_transitions":
+    {"toolchain": [{"type": "CALL_EXPRESSION", "name": "for host"}]}
   , "expression":
     { "type": "let*"
     , "bindings":
@@ -25,6 +90,7 @@
       , ["CXX", {"type": "FIELD", "name": "CXX"}]
       , ["CFLAGS", {"type": "FIELD", "name": "CFLAGS"}]
       , ["CXXFLAGS", {"type": "FIELD", "name": "CXXFLAGS"}]
+      , ["LDFLAGS", {"type": "FIELD", "name": "LDFLAGS"}]
       , ["AR", {"type": "FIELD", "name": "AR"}]
       , ["PATH", {"type": "FIELD", "name": "PATH"}]
       , ["provider", "CC"]
@@ -59,6 +125,14 @@
           , "else": {"type": "CALL_EXPRESSION", "name": "base-provides"}
           }
         ]
+      , ["provider", "LDFLAGS"]
+      , [ "LDFLAGS"
+        , { "type": "if"
+          , "cond": {"type": "var", "name": "LDFLAGS"}
+          , "then": {"type": "var", "name": "LDFLAGS"}
+          , "else": {"type": "CALL_EXPRESSION", "name": "base-provides"}
+          }
+        ]
       , ["provider", "AR"]
       , [ "AR"
         , { "type": "if"
@@ -84,6 +158,92 @@
           , "else": {"type": "CALL_EXPRESSION", "name": "base-provides"}
           }
         ]
+      , ["provider", "NON_SYSTEM_TOOLS"]
+      , ["default", {"type": "empty_map"}]
+      , [ "NON_SYSTEM_TOOLS"
+        , { "type": "map_union"
+          , "$1":
+            { "type": "++"
+            , "$1":
+              [ [{"type": "CALL_EXPRESSION", "name": "base-provides"}]
+              , { "type": "if"
+                , "cond": {"type": "FIELD", "name": "CC"}
+                , "then":
+                  [ { "type": "singleton_map"
+                    , "key": "CC"
+                    , "value":
+                      { "type": "if"
+                      , "cond": {"type": "FIELD", "name": "toolchain"}
+                      , "then": true
+                      , "else": false
+                      }
+                    }
+                  ]
+                }
+              , { "type": "if"
+                , "cond": {"type": "FIELD", "name": "CXX"}
+                , "then":
+                  [ { "type": "singleton_map"
+                    , "key": "CXX"
+                    , "value":
+                      { "type": "if"
+                      , "cond": {"type": "FIELD", "name": "toolchain"}
+                      , "then": true
+                      , "else": false
+                      }
+                    }
+                  ]
+                }
+              , { "type": "if"
+                , "cond": {"type": "FIELD", "name": "AR"}
+                , "then":
+                  [ { "type": "singleton_map"
+                    , "key": "AR"
+                    , "value":
+                      { "type": "if"
+                      , "cond": {"type": "FIELD", "name": "toolchain"}
+                      , "then": true
+                      , "else": false
+                      }
+                    }
+                  ]
+                }
+              , { "type": "foreach"
+                , "range": {"type": "FIELD", "name": "SYSTEM_TOOLS"}
+                , "var": "tool"
+                , "body":
+                  { "type": "singleton_map"
+                  , "key": {"type": "var", "name": "tool"}
+                  , "value": false
+                  }
+                }
+              ]
+            }
+          }
+        ]
+      , ["provider", "TOOLCHAIN"]
+      , ["default", {"type": "empty_map"}]
+      , [ "TOOLCHAIN"
+        , { "type": "map_union"
+          , "$1":
+            [ {"type": "CALL_EXPRESSION", "name": "base-provides"}
+            , { "type": "if"
+              , "cond": {"type": "FIELD", "name": "toolchain"}
+              , "then":
+                { "type": "let*"
+                , "bindings":
+                  [ ["fieldname", "toolchain"]
+                  , [ "transition"
+                    , {"type": "CALL_EXPRESSION", "name": "for host"}
+                    ]
+                  ]
+                , "body": {"type": "CALL_EXPRESSION", "name": "artifacts"}
+                }
+              , "else": {"type": "empty_map"}
+              }
+            ]
+          }
+        ]
       , [ "CFLAGS"
         , { "type": "++"
           , "$1":
@@ -100,12 +260,49 @@
             ]
           }
         ]
+      , [ "LDFLAGS"
+        , { "type": "++"
+          , "$1":
+            [ {"type": "var", "name": "LDFLAGS"}
+            , {"type": "FIELD", "name": "ADD_LDFLAGS"}
+            ]
+          }
+        ]
+      , ["deps-fieldnames", ["base", "deps"]]
+      , ["compile-deps", {"type": "CALL_EXPRESSION", "name": "compile-deps"}]
+      , [ "compile-args"
+        , {"type": "CALL_EXPRESSION", "name": "compile-args-deps"}
+        ]
+      , ["link-deps", {"type": "CALL_EXPRESSION", "name": "link-deps"}]
+      , ["link-args", {"type": "CALL_EXPRESSION", "name": "link-args-deps"}]
+      , [ "cflags-files"
+        , {"type": "CALL_EXPRESSION", "name": "cflags-files-deps"}
+        ]
+      , [ "ldflags-files"
+        , {"type": "CALL_EXPRESSION", "name": "ldflags-files-deps"}
+        ]
+      , ["package", {"type": "env", "vars": ["cflags-files", "ldflags-files"]}]
       ]
     , "body":
       { "type": "RESULT"
       , "provides":
         { "type": "env"
-        , "vars": ["CC", "CXX", "CFLAGS", "CXXFLAGS", "AR", "ENV"]
+        , "vars":
+          [ "CC"
+          , "CXX"
+          , "CFLAGS"
+          , "CXXFLAGS"
+          , "LDFLAGS"
+          , "AR"
+          , "ENV"
+          , "TOOLCHAIN"
+          , "NON_SYSTEM_TOOLS"
+          , "compile-deps"
+          , "compile-args"
+          , "link-deps"
+          , "link-args"
+          , "package"
+          ]
         }
       }
     }
@@ -332,8 +529,10 @@
           , "else": {"type": "var", "name": "name"}
           }
         ]
-      , ["public-fieldnames", ["deps", "proto-deps"]]
-      , ["private-fieldnames", ["deps", "private-deps", "proto-deps"]]
+      , ["public-fieldnames", ["deps", "proto-deps", "defaults"]]
+      , [ "private-fieldnames"
+        , ["deps", "private-deps", "proto-deps", "defaults"]
+        ]
       ]
     , "body": {"type": "CALL_EXPRESSION", "name": "result"}
     }
@@ -471,7 +670,9 @@
           }
         ]
       , ["private-ldflags", {"type": "FIELD", "name": "private-ldflags"}]
-      , ["private-fieldnames", ["private-deps", "private-proto-deps"]]
+      , [ "private-fieldnames"
+        , ["private-deps", "private-proto-deps", "defaults"]
+        ]
       ]
     , "body": {"type": "CALL_EXPRESSION", "name": "bin result"}
     }
diff --git a/rules/CC/auto/RULES b/rules/CC/auto/RULES
index fb75a64e..247ee016 100644
--- a/rules/CC/auto/RULES
+++ b/rules/CC/auto/RULES
@@ -156,6 +156,8 @@
     , "flags-cc": ["./", "..", "flags-cc"]
     , "flags-cxx": ["./", "..", "flags-cxx"]
     , "default-ENV": ["./", "..", "default-ENV"]
+    , "default-TOOLCHAIN": ["./", "..", "default-TOOLCHAIN"]
+    , "default-NON_SYSTEM_TOOLS": ["./", "..", "default-NON_SYSTEM_TOOLS"]
     }
   , "implicit": {"defaults": [["./", "..", "defaults"]]}
   , "expression":
@@ -197,6 +199,17 @@
             }
           }
         ]
+      , ["TOOLCHAIN_DIR", "toolchain"]
+      , ["TOOLCHAIN", {"type": "CALL_EXPRESSION", "name": "default-TOOLCHAIN"}]
+      , [ "TOOLCHAIN"
+        , { "type": "to_subdir"
+          , "subdir": {"type": "var", "name": "TOOLCHAIN_DIR"}
+          , "$1": {"type": "var", "name": "TOOLCHAIN"}
+          }
+        ]
+      , [ "NON_SYSTEM_TOOLS"
+        , {"type": "CALL_EXPRESSION", "name": "default-NON_SYSTEM_TOOLS"}
+        ]
       , ["CC", {"type": "CALL_EXPRESSION", "name": "compiler-cc"}]
       , ["CXX", {"type": "CALL_EXPRESSION", "name": "compiler-cxx"}]
       , ["CFLAGS", {"type": "CALL_EXPRESSION", "name": "flags-cc"}]
@@ -522,7 +535,8 @@
                 , "inputs":
                   { "type": "map_union"
                   , "$1":
-                    [ {"type": "env", "vars": ["file_check.sh", "c.flags"]}
+                    [ {"type": "var", "name": "TOOLCHAIN"}
+                    , {"type": "env", "vars": ["file_check.sh", "c.flags"]}
                     , {"type": "var", "name": "includes"}
                     ]
                   }
@@ -565,7 +579,8 @@
                 , "inputs":
                   { "type": "map_union"
                   , "$1":
-                    [ {"type": "env", "vars": ["file_check.sh", "cxx.flags"]}
+                    [ {"type": "var", "name": "TOOLCHAIN"}
+                    , {"type": "env", "vars": ["file_check.sh", "cxx.flags"]}
                     , {"type": "var", "name": "includes"}
                     ]
                   }
@@ -608,7 +623,8 @@
                 , "inputs":
                   { "type": "map_union"
                   , "$1":
-                    [ {"type": "env", "vars": ["type_check.sh", "c.flags"]}
+                    [ {"type": "var", "name": "TOOLCHAIN"}
+                    , {"type": "env", "vars": ["type_check.sh", "c.flags"]}
                     , {"type": "var", "name": "includes"}
                     ]
                   }
@@ -651,7 +667,8 @@
                 , "inputs":
                   { "type": "map_union"
                   , "$1":
-                    [ {"type": "env", "vars": ["type_check.sh", "cxx.flags"]}
+                    [ {"type": "var", "name": "TOOLCHAIN"}
+                    , {"type": "env", "vars": ["type_check.sh", "cxx.flags"]}
                     , {"type": "var", "name": "includes"}
                     ]
                   }
@@ -696,7 +713,8 @@
                 , "inputs":
                   { "type": "map_union"
                   , "$1":
-                    [ {"type": "env", "vars": ["symbol_check.sh", "c.flags"]}
+                    [ {"type": "var", "name": "TOOLCHAIN"}
+                    , {"type": "env", "vars": ["symbol_check.sh", "c.flags"]}
                     , {"type": "var", "name": "includes"}
                     ]
                   }
@@ -746,7 +764,8 @@
                 , "inputs":
                   { "type": "map_union"
                   , "$1":
-                    [ {"type": "env", "vars": ["symbol_check.sh", "cxx.flags"]}
+                    [ {"type": "var", "name": "TOOLCHAIN"}
+                    , {"type": "env", "vars": ["symbol_check.sh", "cxx.flags"]}
                     , {"type": "var", "name": "includes"}
                     ]
                   }
@@ -796,7 +815,8 @@
                 , "inputs":
                   { "type": "map_union"
                   , "$1":
-                    [ {"type": "env", "vars": ["size_check.sh", "c.flags"]}
+                    [ {"type": "var", "name": "TOOLCHAIN"}
+                    , {"type": "env", "vars": ["size_check.sh", "c.flags"]}
                     , {"type": "var", "name": "includes"}
                     ]
                   }
@@ -853,7 +873,8 @@
                 , "inputs":
                   { "type": "map_union"
                   , "$1":
-                    [ {"type": "env", "vars": ["size_check.sh", "cxx.flags"]}
+                    [ {"type": "var", "name": "TOOLCHAIN"}
+                    , {"type": "env", "vars": ["size_check.sh", "cxx.flags"]}
                     , {"type": "var", "name": "includes"}
                     ]
                   }
diff --git a/rules/CC/test/RULES b/rules/CC/test/RULES
index 755ed92a..350d5855 100644
--- a/rules/CC/test/RULES
+++ b/rules/CC/test/RULES
@@ -153,7 +153,7 @@
       , ["host-trans", {"type": "CALL_EXPRESSION", "name": "host transition"}]
       , ["defaults-transition", {"type": "var", "name": "host-trans"}]
       , ["deps-transition", {"type": "var", "name": "host-trans"}]
-      , ["deps-fieldnames", ["private-deps"]]
+      , ["deps-fieldnames", ["private-deps", "defaults"]]
       , [ "runner"
         , { "type": "map_union"
           , "$1":