Merge commit '9f535dadf06c6c6554bac632069777cf1b63ebf5' into rules/rules-cc

13 files changed, 1048 insertions, 543 deletions

diff --git a/rules/CC/EXPRESSIONS b/rules/CC/EXPRESSIONS
index a520cde..d7289c9 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":
@@ -99,7 +90,7 @@
   }
 , "default-ENV":
   { "vars": ["defaults-transition"]
-  , "imports": {"provider_list": ["./", "..", "field_provider_list"]}
+  , "imports": {"map_provider": ["./", "..", "field_map_provider"]}
   , "expression":
     { "type": "let*"
     , "bindings":
@@ -110,14 +101,54 @@
         ]
       , ["default", {"type": "empty_map"}]
       ]
-    , "body": {"type": "CALL_EXPRESSION", "name": "provider_list"}
+    , "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*"
@@ -586,6 +617,7 @@
     [ "COMPILER"
     , "COMPILE_FLAGS"
     , "ENV"
+    , "TOOLCHAIN"
     , "srcs"
     , "hdrs"
     , "private-hdrs"
@@ -648,6 +680,10 @@
                     , "name": "cflags-files"
                     , "default": {"type": "empty_map"}
                     }
+                  , { "type": "var"
+                    , "name": "TOOLCHAIN"
+                    , "default": {"type": "empty_map"}
+                    }
                   ]
                 }
               ]
@@ -706,25 +742,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"
@@ -825,11 +900,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":
@@ -841,22 +929,32 @@
       , [ "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"
         , { "type": "map_union"
           , "$1":
-            { "type": "++"
-            , "$1":
-              [ {"type": "CALL_EXPRESSION", "name": "default-ENV"}
-              , [ { "type": "var"
-                  , "name": "ENV"
-                  , "default": {"type": "empty_map"}
-                  }
-                ]
-              ]
-            }
+            [ {"type": "CALL_EXPRESSION", "name": "default-ENV"}
+            , {"type": "var", "name": "ENV", "default": {"type": "empty_map"}}
+            ]
           }
         ]
       , ["objects", {"type": "CALL_EXPRESSION", "name": "objects"}]
@@ -897,7 +995,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":
@@ -1080,13 +1184,26 @@
     { "compiler": "compiler"
     , "flags": "flags"
     , "objects": "objects"
-    , "default-LDFLAGS": "default-LDFLAGS"
     , "default-ENV": "default-ENV"
+    , "default-LDFLAGS": "default-LDFLAGS"
+    , "default-TOOLCHAIN": "default-TOOLCHAIN"
+    , "default-NON_SYSTEM_TOOLS": "default-NON_SYSTEM_TOOLS"
     }
   , "expression":
     { "type": "let*"
     , "bindings":
       [ ["BUILD_POSITION_INDEPENDENT", true]
+      , ["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": "++"
@@ -1111,16 +1228,9 @@
       , [ "ENV"
         , { "type": "map_union"
           , "$1":
-            { "type": "++"
-            , "$1":
-              [ {"type": "CALL_EXPRESSION", "name": "default-ENV"}
-              , [ { "type": "var"
-                  , "name": "ENV"
-                  , "default": {"type": "empty_map"}
-                  }
-                ]
-              ]
-            }
+            [ {"type": "CALL_EXPRESSION", "name": "default-ENV"}
+            , {"type": "var", "name": "ENV", "default": {"type": "empty_map"}}
+            ]
           }
         ]
       , ["objects", {"type": "CALL_EXPRESSION", "name": "objects"}]
@@ -1162,7 +1272,8 @@
             , "inputs":
               { "type": "map_union"
               , "$1":
-                [ {"type": "var", "name": "objects"}
+                [ {"type": "var", "name": "TOOLCHAIN"}
+                , {"type": "var", "name": "objects"}
                 , {"type": "var", "name": "link-deps"}
                 , {"type": "var", "name": "run-libs"}
                 , { "type": "var"
@@ -1190,11 +1301,11 @@
                     }
                   ]
                 , {"type": "var", "name": "COMPILE_FLAGS"}
-                , {"type": "var", "name": "LDFLAGS"}
                 , ["-o", {"type": "var", "name": "libname"}]
                 , {"type": "keys", "$1": {"type": "var", "name": "objects"}}
                 , {"type": "var", "name": "link-args"}
                 , {"type": "var", "name": "run-libs-args"}
+                , {"type": "var", "name": "LDFLAGS"}
                 ]
               }
             }
@@ -1227,6 +1338,7 @@
     , "soversion"
     , "pkg-name"
     , "extra-provides"
+    , "defaults-transition"
     , "deps-transition"
     , "public-fieldnames"
     , "private-fieldnames"
@@ -1406,11 +1518,24 @@
     , "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":
@@ -1434,16 +1559,9 @@
       , [ "ENV"
         , { "type": "map_union"
           , "$1":
-            { "type": "++"
-            , "$1":
-              [ {"type": "CALL_EXPRESSION", "name": "default-ENV"}
-              , [ { "type": "var"
-                  , "name": "ENV"
-                  , "default": {"type": "empty_map"}
-                  }
-                ]
-              ]
-            }
+            [ {"type": "CALL_EXPRESSION", "name": "default-ENV"}
+            , {"type": "var", "name": "ENV", "default": {"type": "empty_map"}}
+            ]
           }
         ]
       , ["hdrs", {"type": "empty_map"}]
@@ -1479,7 +1597,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": "run-libs"}
               , { "type": "var"
@@ -1502,9 +1621,9 @@
                 , {"type": "var", "name": "binpath"}
                 ]
               , {"type": "var", "name": "COMPILE_FLAGS"}
-              , {"type": "var", "name": "LDFLAGS"}
               , {"type": "var", "name": "link-args"}
               , {"type": "var", "name": "run-libs-args"}
+              , {"type": "var", "name": "LDFLAGS"}
               ]
             }
           , "env": {"type": "var", "name": "ENV"}
diff --git a/rules/CC/RULES b/rules/CC/RULES
index 37460d3..d2aeece 100644
--- a/rules/CC/RULES
+++ b/rules/CC/RULES
@@ -6,7 +6,7 @@
     , "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"
@@ -18,12 +18,28 @@
     , "ADD_LDFLAGS"
     , "AR"
     , "PATH"
+    , "SYSTEM_TOOLS"
     ]
   , "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\"."
@@ -53,7 +69,22 @@
       , "with \":\"."
       ]
     }
-  , "imports": {"base-provides": "defaults-base-provides"}
+  , "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"
+    , "run-libs-deps": "run-libs-deps"
+    , "run-libs-args-deps": "run-libs-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":
@@ -96,6 +127,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"
@@ -105,6 +144,7 @@
           }
         ]
       , ["provider", "ENV"]
+      , ["default", {"type": "empty_map"}]
       , [ "ENV"
         , { "type": "if"
           , "cond": {"type": "var", "name": "PATH"}
@@ -120,6 +160,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":
@@ -144,12 +270,47 @@
             ]
           }
         ]
+      , ["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"}]
+      , ["run-libs", {"type": "CALL_EXPRESSION", "name": "run-libs-deps"}]
+      , [ "run-libs-args"
+        , {"type": "CALL_EXPRESSION", "name": "run-libs-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", "LDFLAGS", "AR", "ENV"]
+        , "vars":
+          [ "CC"
+          , "CXX"
+          , "CFLAGS"
+          , "CXXFLAGS"
+          , "LDFLAGS"
+          , "AR"
+          , "ENV"
+          , "TOOLCHAIN"
+          , "NON_SYSTEM_TOOLS"
+          , "compile-deps"
+          , "compile-args"
+          , "link-deps"
+          , "link-args"
+          , "run-libs"
+          , "run-libs-args"
+          , "package"
+          ]
         }
       }
     }
@@ -361,6 +522,7 @@
     , "proto-deps": [{"type": "CALL_EXPRESSION", "name": "fPIC transition"}]
     , "private-proto-deps":
       [{"type": "CALL_EXPRESSION", "name": "fPIC transition"}]
+    , "defaults": [{"type": "CALL_EXPRESSION", "name": "fPIC transition"}]
     }
   , "expression":
     { "type": "let*"
@@ -440,12 +602,20 @@
           , "else": {"type": "var", "name": "name"}
           }
         ]
+      , [ "defaults-transition"
+        , {"type": "CALL_EXPRESSION", "name": "fPIC transition"}
+        ]
       , [ "deps-transition"
         , {"type": "CALL_EXPRESSION", "name": "fPIC transition"}
         ]
-      , ["public-fieldnames", ["deps", "proto-deps"]]
+      , ["public-fieldnames", ["deps", "proto-deps", "defaults"]]
       , [ "private-fieldnames"
-        , ["deps", "private-deps", "proto-deps", "private-proto-deps"]
+        , [ "deps"
+          , "private-deps"
+          , "proto-deps"
+          , "private-proto-deps"
+          , "defaults"
+          ]
         ]
       ]
     , "body":
@@ -608,7 +778,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 e04289c..247ee01 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"}]
@@ -204,16 +217,9 @@
       , [ "ENV"
         , { "type": "map_union"
           , "$1":
-            { "type": "++"
-            , "$1":
-              [ {"type": "CALL_EXPRESSION", "name": "default-ENV"}
-              , [ { "type": "var"
-                  , "name": "ENV"
-                  , "default": {"type": "empty_map"}
-                  }
-                ]
-              ]
-            }
+            [ {"type": "CALL_EXPRESSION", "name": "default-ENV"}
+            , {"type": "var", "name": "ENV", "default": {"type": "empty_map"}}
+            ]
           }
         ]
       , [ "c.flags"
@@ -529,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"}
                     ]
                   }
@@ -572,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"}
                     ]
                   }
@@ -615,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"}
                     ]
                   }
@@ -658,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"}
                     ]
                   }
@@ -703,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"}
                     ]
                   }
@@ -753,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"}
                     ]
                   }
@@ -803,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"}
                     ]
                   }
@@ -860,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/foreign/cmake/EXPRESSIONS b/rules/CC/foreign/cmake/EXPRESSIONS
index 8977d5a..4c21f4b 100644
--- a/rules/CC/foreign/cmake/EXPRESSIONS
+++ b/rules/CC/foreign/cmake/EXPRESSIONS
@@ -1,6 +1,7 @@
 { "cmake-build":
   { "vars":
     [ "source_dir"
+    , "cmake_subdir"
     , "cmake_options"
     , "cmake_defines"
     , "cmake_jobs"
@@ -27,11 +28,24 @@
     , "default-LDFLAGS": ["CC", "default-LDFLAGS"]
     , "default-AR": ["CC", "default-AR"]
     , "default-ENV": ["CC", "default-ENV"]
+    , "default-TOOLCHAIN": ["CC", "default-TOOLCHAIN"]
+    , "default-NON_SYSTEM_TOOLS": ["CC", "default-NON_SYSTEM_TOOLS"]
     }
   , "expression":
     { "type": "let*"
     , "bindings":
-      [ [ "CMAKE_FLAGS"
+      [ ["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"}
+        ]
+      , [ "CMAKE_FLAGS"
         , { "type": "++"
           , "$1":
             [ { "type": "foreach"
@@ -47,6 +61,7 @@
               , "cond": {"type": "var", "name": "BUILD_POSITION_INDEPENDENT"}
               , "then": ["-DCMAKE_POSITION_INDEPENDENT_CODE=ON"]
               }
+            , ["-DCMAKE_INSTALL_RPATH=$ORIGIN;$ORIGIN/../lib"]
             ]
           }
         ]
@@ -84,26 +99,35 @@
       , [ "ENV"
         , { "type": "map_union"
           , "$1":
-            { "type": "++"
-            , "$1":
-              [ {"type": "CALL_EXPRESSION", "name": "default-ENV"}
-              , [ { "type": "var"
-                  , "name": "ENV"
-                  , "default": {"type": "empty_map"}
-                  }
-                ]
-              , [ { "type": "env"
-                  , "vars": ["CC", "CXX", "CXXFLAGS", "CFLAGS", "LDFLAGS"]
-                  }
-                ]
-              ]
-            }
+            [ {"type": "CALL_EXPRESSION", "name": "default-ENV"}
+            , {"type": "var", "name": "ENV", "default": {"type": "empty_map"}}
+            , { "type": "env"
+              , "vars": ["CC", "CXX", "CXXFLAGS", "CFLAGS", "LDFLAGS"]
+              }
+            ]
           }
         ]
       , [ "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"}
+                ]
+              }
+            }
           }
         ]
       , [ "CMAKE_JOBS"
@@ -121,6 +145,12 @@
             ]
           }
         ]
+      , [ "CMAKE_SUBDIR"
+        , { "type": "join"
+          , "separator": "/"
+          , "$1": {"type": "var", "name": "cmake_subdir", "default": []}
+          }
+        ]
       , [ "script"
         , { "type": "singleton_map"
           , "key": "run_cmake.sh"
@@ -147,9 +177,10 @@
                         ]
                       }
                     }
-                  , [ "readonly CMAKE_AR=$(which $1)"
-                    , "shift"
-                    , "cmake \"$@\" -Ssource -Bbuild -DCMAKE_AR=${CMAKE_AR} -DCMAKE_INSTALL_PREFIX=./install >configure.log || (cat configure.log && exit 1)"
+                  , [ "readonly CMAKE_SUBDIR=\"$1\""
+                    , "readonly CMAKE_AR=$(which $2)"
+                    , "shift 2"
+                    , "cmake \"$@\" -S\"source/${CMAKE_SUBDIR}\" -Bbuild -DCMAKE_AR=${CMAKE_AR} -DCMAKE_INSTALL_PREFIX=./install >configure.log 2>&1 || (cat configure.log && exit 1)"
                     ]
                   , [ { "type": "join"
                       , "separator": " "
@@ -157,7 +188,7 @@
                         { "type": "++"
                         , "$1":
                           [ {"type": "var", "name": "CMAKE_JOBS"}
-                          , [ "cmake --build build --target install >build.log || (cat configure.log build.log && exit 1)"
+                          , [ "cmake --build build --target install >build.log 2>&1 || (cat configure.log build.log && exit 1)"
                             ]
                           ]
                         }
@@ -192,14 +223,19 @@
       , "inputs":
         { "type": "map_union"
         , "$1":
-          [ {"type": "var", "name": "source_dir"}
+          [ {"type": "var", "name": "TOOLCHAIN"}
+          , {"type": "var", "name": "source_dir"}
           , {"type": "var", "name": "script"}
           ]
         }
       , "cmd":
         { "type": "++"
         , "$1":
-          [ ["/bin/sh", "run_cmake.sh", {"type": "var", "name": "AR"}]
+          [ [ "/bin/sh"
+            , "run_cmake.sh"
+            , {"type": "var", "name": "CMAKE_SUBDIR"}
+            , {"type": "var", "name": "AR"}
+            ]
           , {"type": "var", "name": "CMAKE_FLAGS"}
           ]
         }
diff --git a/rules/CC/foreign/cmake/RULES b/rules/CC/foreign/cmake/RULES
index 8651f4e..a53b92e 100644
--- a/rules/CC/foreign/cmake/RULES
+++ b/rules/CC/foreign/cmake/RULES
@@ -2,7 +2,8 @@
   { "doc": ["Data produced by CMake configure, build, and install."]
   , "target_fields": ["project"]
   , "string_fields":
-    [ "options"
+    [ "subdir"
+    , "options"
     , "defines"
     , "jobs"
     , "pre_cmds"
@@ -27,6 +28,10 @@
   , "field_doc":
     { "project":
       ["The CMake project directory. It should contain a single tree artifact"]
+    , "subdir":
+      [ "The subdirectory that contains the entry CMakeLists.txt. Individual"
+      , "directory components are joined with \"/\"."
+      ]
     , "options":
       [ "CMake options for the configuration phase."
       , "(e.g., [\"-GNinja\", \"-Ax64\"])"
@@ -162,6 +167,7 @@
             }
           }
         ]
+      , ["cmake_subdir", {"type": "FIELD", "name": "subdir"}]
       , ["cmake_options", {"type": "FIELD", "name": "options"}]
       , ["cmake_defines", {"type": "FIELD", "name": "defines"}]
       , ["cmake_jobs", {"type": "FIELD", "name": "jobs"}]
@@ -218,7 +224,8 @@
   { "doc": ["Library produced by CMake configure, build, and install."]
   , "target_fields": ["project", "deps"]
   , "string_fields":
-    [ "name"
+    [ "subdir"
+    , "name"
     , "version"
     , "stage"
     , "options"
@@ -256,6 +263,10 @@
   , "field_doc":
     { "project":
       ["The CMake project directory. It should contain a single tree artifact"]
+    , "subdir":
+      [ "The subdirectory that contains the entry CMakeLists.txt. Individual"
+      , "directory components are joined with \"/\"."
+      ]
     , "name":
       [ "The name of the library (without leading \"lib\" or trailing file name"
       , "extension), also used as name for pkg-config files."
@@ -509,6 +520,7 @@
             ]
           }
         ]
+      , ["cmake_subdir", {"type": "FIELD", "name": "subdir"}]
       , ["cmake_options", {"type": "FIELD", "name": "options"}]
       , ["cmake_defines", {"type": "FIELD", "name": "defines"}]
       , ["cmake_jobs", {"type": "FIELD", "name": "jobs"}]
@@ -589,7 +601,7 @@
           , "$1": {"type": "FIELD", "name": "stage"}
           }
         ]
-      , ["deps-fieldnames", ["deps"]]
+      , ["deps-fieldnames", ["deps", "defaults"]]
       ]
     , "body": {"type": "CALL_EXPRESSION", "name": "prebuilt result"}
     }
diff --git a/rules/CC/foreign/make/EXPRESSIONS b/rules/CC/foreign/make/EXPRESSIONS
index e853b29..df2f98f 100644
--- a/rules/CC/foreign/make/EXPRESSIONS
+++ b/rules/CC/foreign/make/EXPRESSIONS
@@ -1,7 +1,10 @@
 { "make-build":
   { "vars":
     [ "source_dir"
-    , "make_target"
+    , "subdir"
+    , "configure"
+    , "configure_options"
+    , "make_targets"
     , "make_prefix"
     , "make_options"
     , "make_jobs"
@@ -37,11 +40,24 @@
     , "default-LDFLAGS": ["CC", "default-LDFLAGS"]
     , "default-AR": ["CC", "default-AR"]
     , "default-ENV": ["CC", "default-ENV"]
+    , "default-TOOLCHAIN": ["CC", "default-TOOLCHAIN"]
+    , "default-NON_SYSTEM_TOOLS": ["CC", "default-NON_SYSTEM_TOOLS"]
     }
   , "expression":
     { "type": "let*"
     , "bindings":
-      [ ["CC", {"type": "CALL_EXPRESSION", "name": "compiler-cc"}]
+      [ ["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": "join"
@@ -61,7 +77,8 @@
           , "$1":
             { "type": "++"
             , "$1":
-              [ { "type": "var"
+              [ ["-Wl,-rpath,$ORIGIN", "-Wl,-rpath,$ORIGIN/../lib"]
+              , { "type": "var"
                 , "name": "LDFLAGS"
                 , "default":
                   {"type": "CALL_EXPRESSION", "name": "default-LDFLAGS"}
@@ -74,123 +91,152 @@
       , [ "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"}
+                ]
+              }
+            }
+          }
+        ]
+      , [ "PREFIX"
+        , { "type": "if"
+          , "cond": {"type": "var", "name": "make_prefix"}
+          , "then":
+            { "type": "join"
+            , "separator": "/"
+            , "$1":
+              { "type": "++"
+              , "$1": [[""], {"type": "var", "name": "make_prefix"}]
+              }
+            }
+          , "else": {"type": "var", "name": "PREFIX", "default": "/"}
           }
         ]
       , [ "ENV"
         , { "type": "map_union"
           , "$1":
-            { "type": "++"
-            , "$1":
-              [ {"type": "CALL_EXPRESSION", "name": "default-ENV"}
-              , [ { "type": "var"
-                  , "name": "ENV"
-                  , "default": {"type": "empty_map"}
-                  }
-                ]
-              , [ { "type": "singleton_map"
-                  , "key":
-                    { "type": "if"
-                    , "cond": {"type": "var", "name": "var_cc"}
-                    , "then":
-                      {"type": "join", "$1": {"type": "var", "name": "var_cc"}}
-                    , "else": "CC"
-                    }
-                  , "value": {"type": "var", "name": "CC"}
-                  }
-                ]
-              , [ { "type": "singleton_map"
-                  , "key":
-                    { "type": "if"
-                    , "cond": {"type": "var", "name": "var_cxx"}
-                    , "then":
-                      { "type": "join"
-                      , "$1": {"type": "var", "name": "var_cxx"}
-                      }
-                    , "else": "CXX"
-                    }
-                  , "value": {"type": "var", "name": "CXX"}
-                  }
-                ]
-              , [ { "type": "singleton_map"
-                  , "key":
-                    { "type": "if"
-                    , "cond": {"type": "var", "name": "var_ccflags"}
-                    , "then":
-                      { "type": "join"
-                      , "$1": {"type": "var", "name": "var_ccflags"}
-                      }
-                    , "else": "CFLAGS"
-                    }
-                  , "value": {"type": "var", "name": "CFLAGS"}
-                  }
-                ]
-              , [ { "type": "singleton_map"
-                  , "key":
-                    { "type": "if"
-                    , "cond": {"type": "var", "name": "var_cxxflags"}
-                    , "then":
-                      { "type": "join"
-                      , "$1": {"type": "var", "name": "var_cxxflags"}
-                      }
-                    , "else": "CXXFLAGS"
-                    }
-                  , "value": {"type": "var", "name": "CXXFLAGS"}
+            [ {"type": "CALL_EXPRESSION", "name": "default-ENV"}
+            , {"type": "var", "name": "ENV", "default": {"type": "empty_map"}}
+            , { "type": "singleton_map"
+              , "key":
+                { "type": "if"
+                , "cond": {"type": "var", "name": "var_cc"}
+                , "then":
+                  {"type": "join", "$1": {"type": "var", "name": "var_cc"}}
+                , "else": "CC"
+                }
+              , "value": {"type": "var", "name": "CC"}
+              }
+            , { "type": "singleton_map"
+              , "key":
+                { "type": "if"
+                , "cond": {"type": "var", "name": "var_cxx"}
+                , "then":
+                  {"type": "join", "$1": {"type": "var", "name": "var_cxx"}}
+                , "else": "CXX"
+                }
+              , "value": {"type": "var", "name": "CXX"}
+              }
+            , { "type": "singleton_map"
+              , "key":
+                { "type": "if"
+                , "cond": {"type": "var", "name": "var_ccflags"}
+                , "then":
+                  { "type": "join"
+                  , "$1": {"type": "var", "name": "var_ccflags"}
                   }
-                ]
-              , [ { "type": "singleton_map"
-                  , "key":
-                    { "type": "if"
-                    , "cond": {"type": "var", "name": "var_ldflags"}
-                    , "then":
-                      { "type": "join"
-                      , "$1": {"type": "var", "name": "var_ldflags"}
-                      }
-                    , "else": "LDFLAGS"
-                    }
-                  , "value": {"type": "var", "name": "LDFLAGS"}
+                , "else": "CFLAGS"
+                }
+              , "value": {"type": "var", "name": "CFLAGS"}
+              }
+            , { "type": "singleton_map"
+              , "key":
+                { "type": "if"
+                , "cond": {"type": "var", "name": "var_cxxflags"}
+                , "then":
+                  { "type": "join"
+                  , "$1": {"type": "var", "name": "var_cxxflags"}
                   }
-                ]
-              , [ { "type": "singleton_map"
-                  , "key":
-                    { "type": "if"
-                    , "cond": {"type": "var", "name": "var_ar"}
-                    , "then":
-                      {"type": "join", "$1": {"type": "var", "name": "var_ar"}}
-                    , "else": "AR"
-                    }
-                  , "value": {"type": "var", "name": "AR"}
+                , "else": "CXXFLAGS"
+                }
+              , "value": {"type": "var", "name": "CXXFLAGS"}
+              }
+            , { "type": "singleton_map"
+              , "key":
+                { "type": "if"
+                , "cond": {"type": "var", "name": "var_ldflags"}
+                , "then":
+                  { "type": "join"
+                  , "$1": {"type": "var", "name": "var_ldflags"}
                   }
-                ]
-              , [ { "type": "singleton_map"
-                  , "key":
-                    { "type": "if"
-                    , "cond": {"type": "var", "name": "var_prefix"}
-                    , "then":
-                      { "type": "join"
-                      , "$1": {"type": "var", "name": "var_prefix"}
-                      }
-                    , "else": "PREFIX"
-                    }
-                  , "value":
-                    { "type": "if"
-                    , "cond": {"type": "var", "name": "make_prefix"}
-                    , "then":
-                      { "type": "join"
-                      , "separator": "/"
-                      , "$1":
-                        { "type": "++"
-                        , "$1": [[""], {"type": "var", "name": "make_prefix"}]
-                        }
-                      }
-                    , "else": {"type": "var", "name": "PREFIX", "default": "/"}
-                    }
+                , "else": "LDFLAGS"
+                }
+              , "value": {"type": "var", "name": "LDFLAGS"}
+              }
+            , { "type": "singleton_map"
+              , "key":
+                { "type": "if"
+                , "cond": {"type": "var", "name": "var_ar"}
+                , "then":
+                  {"type": "join", "$1": {"type": "var", "name": "var_ar"}}
+                , "else": "AR"
+                }
+              , "value": {"type": "var", "name": "AR"}
+              }
+            , { "type": "singleton_map"
+              , "key":
+                { "type": "if"
+                , "cond": {"type": "var", "name": "var_prefix"}
+                , "then":
+                  {"type": "join", "$1": {"type": "var", "name": "var_prefix"}}
+                , "else": "PREFIX"
+                }
+              , "value": {"type": "var", "name": "PREFIX"}
+              }
+            ]
+          }
+        ]
+      , [ "SUBDIR"
+        , { "type": "join"
+          , "separator": "/"
+          , "$1": {"type": "var", "name": "subdir", "default": []}
+          }
+        ]
+      , [ "configure_args"
+        , { "type": "if"
+          , "cond": {"type": "var", "name": "configure"}
+          , "then":
+            { "type": "++"
+            , "$1":
+              [ {"type": "var", "name": "configure_options", "default": []}
+              , [ { "type": "join"
+                  , "$1": ["--prefix=", {"type": "var", "name": "PREFIX"}]
                   }
                 ]
               ]
             }
           }
         ]
+      , [ "make_targets"
+        , { "type": "if"
+          , "cond": {"type": "var", "name": "make_targets"}
+          , "then": {"type": "var", "name": "make_targets"}
+          , "else": ["install"]
+          }
+        ]
       , [ "script"
         , { "type": "singleton_map"
           , "key": "run_make.sh"
@@ -217,12 +263,43 @@
                         ]
                       }
                     }
-                  , [ "readonly VAR_DESTDIR=$1"
-                    , "shift"
-                    , "make \"$@\" -C source ${VAR_DESTDIR}=$(pwd)/install >build.log || (cat build.log && exit 1)"
-                    , "find ./install -type l -delete"
+                  , [ "readonly SUBDIR=\"$1\""
+                    , "readonly VAR_DESTDIR=$2"
+                    , "shift 2"
                     ]
                   , { "type": "if"
+                    , "cond": {"type": "var", "name": "configure_args"}
+                    , "then":
+                      [ "( readonly ROOT=\"$(pwd)\""
+                      , "  cd \"source/${SUBDIR}\""
+                      , { "type": "join"
+                        , "$1":
+                          [ "./configure "
+                          , { "type": "join_cmd"
+                            , "$1": {"type": "var", "name": "configure_args"}
+                            }
+                          , " >\"${ROOT}/configure.log\" 2>&1 || (cat \"${ROOT}/configure.log\" && exit 1)"
+                          ]
+                        }
+                      , ")"
+                      ]
+                    }
+                  , { "type": "foreach"
+                    , "range": {"type": "var", "name": "make_targets"}
+                    , "var": "target"
+                    , "body":
+                      { "type": "join"
+                      , "$1":
+                        [ "make \"$@\" -C \"source/${SUBDIR}\" ${VAR_DESTDIR}=$(pwd)/install "
+                        , { "type": "join_cmd"
+                          , "$1": [{"type": "var", "name": "target"}]
+                          }
+                        , " >>build.log 2>&1 || (cat build.log && exit 1)"
+                        ]
+                      }
+                    }
+                  , ["find ./install -type l -delete"]
+                  , { "type": "if"
                     , "cond": {"type": "var", "name": "post_cmds"}
                     , "then":
                       { "type": "++"
@@ -245,7 +322,8 @@
       , "inputs":
         { "type": "map_union"
         , "$1":
-          [ {"type": "var", "name": "source_dir"}
+          [ {"type": "var", "name": "TOOLCHAIN"}
+          , {"type": "var", "name": "source_dir"}
           , {"type": "var", "name": "script"}
           ]
         }
@@ -253,6 +331,7 @@
         { "type": "++"
         , "$1":
           [ ["/bin/sh", "run_make.sh"]
+          , [{"type": "var", "name": "SUBDIR"}]
           , { "type": "if"
             , "cond": {"type": "var", "name": "var_destdir"}
             , "then":
@@ -260,12 +339,6 @@
             , "else": ["DESTDIR"]
             }
           , {"type": "var", "name": "make_options"}
-          , { "type": "if"
-            , "cond": {"type": "var", "name": "make_target"}
-            , "then":
-              [{"type": "join", "$1": {"type": "var", "name": "make_target"}}]
-            , "else": ["install"]
-            }
           , [ { "type": "join"
               , "$1":
                 { "type": "++"
diff --git a/rules/CC/foreign/make/RULES b/rules/CC/foreign/make/RULES
index 9c8c738..8278e3f 100644
--- a/rules/CC/foreign/make/RULES
+++ b/rules/CC/foreign/make/RULES
@@ -1,8 +1,11 @@
 { "data":
-  { "doc": ["Data produced by Make build and install."]
+  { "doc": ["Data produced by Configure and Make build and install."]
   , "target_fields": ["project"]
   , "string_fields":
-    [ "target"
+    [ "subdir"
+    , "configure"
+    , "configure_options"
+    , "targets"
     , "prefix"
     , "options"
     , "jobs"
@@ -37,7 +40,17 @@
   , "field_doc":
     { "project":
       ["The Make project directory. It should contain a single tree artifact"]
-    , "target": ["The Make target to build (default: [\"install\"])."]
+    , "subdir":
+      [ "The subdirectory that contains the configure and Makefile. Individual"
+      , "directory components are joined with \"/\"."
+      ]
+    , "configure": ["Run ./configure if non-empty."]
+    , "configure_options":
+      ["The configure options (the \"--prefix\" option is automatically set."]
+    , "targets":
+      [ "The Make targets to build in the specified order"
+      , "(default: [\"install\"])."
+      ]
     , "prefix":
       [ "The prefix used for the Make target. The path will be made absolute"
       , "and individual directory components are joined with \"/\". If no"
@@ -195,7 +208,10 @@
             }
           }
         ]
-      , ["make_target", {"type": "FIELD", "name": "target"}]
+      , ["subdir", {"type": "FIELD", "name": "subdir"}]
+      , ["configure", {"type": "FIELD", "name": "configure"}]
+      , ["configure_options", {"type": "FIELD", "name": "configure_options"}]
+      , ["make_targets", {"type": "FIELD", "name": "targets"}]
       , ["make_prefix", {"type": "FIELD", "name": "prefix"}]
       , ["make_options", {"type": "FIELD", "name": "options"}]
       , ["make_jobs", {"type": "FIELD", "name": "jobs"}]
@@ -255,13 +271,16 @@
     }
   }
 , "library":
-  { "doc": ["Library produced by Make build and install."]
+  { "doc": ["Library produced by Configure and Make build and install."]
   , "target_fields": ["project", "deps"]
   , "string_fields":
-    [ "name"
+    [ "subdir"
+    , "name"
     , "version"
     , "stage"
-    , "target"
+    , "configure"
+    , "configure_options"
+    , "targets"
     , "prefix"
     , "options"
     , "jobs"
@@ -306,6 +325,10 @@
   , "field_doc":
     { "project":
       ["The Make project directory. It should contain a single tree artifact"]
+    , "subdir":
+      [ "The subdirectory that contains the configure and Makefile. Individual"
+      , "directory components are joined with \"/\"."
+      ]
     , "name":
       [ "The name of the library (without leading \"lib\" or trailing file name"
       , "extension), also used as name for pkg-config files."
@@ -314,7 +337,13 @@
       [ "The library version, used for pkg-config files. Individual version"
       , "components are joined with \".\"."
       ]
-    , "target": ["The Make target to build (default: [\"install\"])."]
+    , "configure": ["Run ./configure if non-empty."]
+    , "configure_options":
+      ["The configure options (the \"--prefix\" option is automatically set."]
+    , "targets":
+      [ "The Make targets to build in the specified order"
+      , "(default: [\"install\"])."
+      ]
     , "prefix":
       [ "The prefix used for the Make target. The path will be made absolute"
       , "and individual directory components are joined with \"/\". If no"
@@ -581,7 +610,10 @@
             ]
           }
         ]
-      , ["make_target", {"type": "FIELD", "name": "target"}]
+      , ["subdir", {"type": "FIELD", "name": "subdir"}]
+      , ["configure", {"type": "FIELD", "name": "configure"}]
+      , ["configure_options", {"type": "FIELD", "name": "configure_options"}]
+      , ["make_targets", {"type": "FIELD", "name": "targets"}]
       , ["make_prefix", {"type": "FIELD", "name": "prefix"}]
       , ["make_options", {"type": "FIELD", "name": "options"}]
       , ["make_jobs", {"type": "FIELD", "name": "jobs"}]
@@ -668,7 +700,7 @@
           , "$1": {"type": "FIELD", "name": "stage"}
           }
         ]
-      , ["deps-fieldnames", ["deps"]]
+      , ["deps-fieldnames", ["deps", "defaults"]]
       ]
     , "body": {"type": "CALL_EXPRESSION", "name": "prebuilt result"}
     }
diff --git a/rules/CC/pkgconfig/EXPRESSIONS b/rules/CC/pkgconfig/EXPRESSIONS
index c770421..4c174c4 100644
--- a/rules/CC/pkgconfig/EXPRESSIONS
+++ b/rules/CC/pkgconfig/EXPRESSIONS
@@ -7,16 +7,9 @@
       [ [ "ENV"
         , { "type": "map_union"
           , "$1":
-            { "type": "++"
-            , "$1":
-              [ {"type": "CALL_EXPRESSION", "name": "default-ENV"}
-              , [ { "type": "var"
-                  , "name": "ENV"
-                  , "default": {"type": "empty_map"}
-                  }
-                ]
-              ]
-            }
+            [ {"type": "CALL_EXPRESSION", "name": "default-ENV"}
+            , {"type": "var", "name": "ENV", "default": {"type": "empty_map"}}
+            ]
           }
         ]
       , [ "cflags-filename"
diff --git a/rules/CC/prebuilt/EXPRESSIONS b/rules/CC/prebuilt/EXPRESSIONS
index 6b7169a..c404bec 100644
--- a/rules/CC/prebuilt/EXPRESSIONS
+++ b/rules/CC/prebuilt/EXPRESSIONS
@@ -234,16 +234,9 @@
       , [ "ENV"
         , { "type": "map_union"
           , "$1":
-            { "type": "++"
-            , "$1":
-              [ {"type": "CALL_EXPRESSION", "name": "default-ENV"}
-              , [ { "type": "var"
-                  , "name": "ENV"
-                  , "default": {"type": "empty_map"}
-                  }
-                ]
-              ]
-            }
+            [ {"type": "CALL_EXPRESSION", "name": "default-ENV"}
+            , {"type": "var", "name": "ENV", "default": {"type": "empty_map"}}
+            ]
           }
         ]
       , [ "main-pkg-config"
diff --git a/rules/CC/proto/EXPRESSIONS b/rules/CC/proto/EXPRESSIONS
index 894b80b..6be74df 100644
--- a/rules/CC/proto/EXPRESSIONS
+++ b/rules/CC/proto/EXPRESSIONS
@@ -138,14 +138,9 @@
       , ["TOOLCHAIN_DIR", "toolchain"]
       , ["TOOLCHAIN", {"type": "CALL_EXPRESSION", "name": "default-TOOLCHAIN"}]
       , [ "TOOLCHAIN"
-        , { "type": "if"
-          , "cond": {"type": "var", "name": "TOOLCHAIN"}
-          , "then":
-            { "type": "to_subdir"
-            , "subdir": {"type": "var", "name": "TOOLCHAIN_DIR"}
-            , "$1": {"type": "var", "name": "TOOLCHAIN"}
-            }
-          , "else": {"type": "empty_map"}
+        , { "type": "to_subdir"
+          , "subdir": {"type": "var", "name": "TOOLCHAIN_DIR"}
+          , "$1": {"type": "var", "name": "TOOLCHAIN"}
           }
         ]
       , [ "NON_SYSTEM_TOOLS"
diff --git a/rules/CC/proto/RULES b/rules/CC/proto/RULES
index 6d2e725..ac7a371 100644
--- a/rules/CC/proto/RULES
+++ b/rules/CC/proto/RULES
@@ -61,6 +61,8 @@
     , "compile-args-deps": ["CC", "compile-args-deps"]
     , "link-deps": ["CC", "link-deps"]
     , "link-args-deps": ["CC", "link-args-deps"]
+    , "run-libs-deps": ["CC", "run-libs-deps"]
+    , "run-libs-args-deps": ["CC", "run-libs-args-deps"]
     , "cflags-files-deps": ["CC", "cflags-files-deps"]
     , "ldflags-files-deps": ["CC", "ldflags-files-deps"]
     , "for host": ["transitions", "for host"]
@@ -193,6 +195,10 @@
         ]
       , ["link-deps", {"type": "CALL_EXPRESSION", "name": "link-deps"}]
       , ["link-args", {"type": "CALL_EXPRESSION", "name": "link-args-deps"}]
+      , ["run-libs", {"type": "CALL_EXPRESSION", "name": "run-libs-deps"}]
+      , [ "run-libs-args"
+        , {"type": "CALL_EXPRESSION", "name": "run-libs-args-deps"}
+        ]
       , [ "cflags-files"
         , {"type": "CALL_EXPRESSION", "name": "cflags-files-deps"}
         ]
@@ -216,6 +222,8 @@
           , "compile-args"
           , "link-deps"
           , "link-args"
+          , "run-libs"
+          , "run-libs-args"
           , "package"
           ]
         }
@@ -245,8 +253,8 @@
           , "$1": {"type": "FIELD", "name": "stage"}
           }
         ]
-      , ["public-fieldnames", ["deps", "proto-defaults"]]
-      , ["private-fieldnames", ["deps", "proto-defaults"]]
+      , ["public-fieldnames", ["deps", "proto-defaults", "defaults"]]
+      , ["private-fieldnames", ["deps", "proto-defaults", "defaults"]]
       ]
     , "body": {"type": "CALL_EXPRESSION", "name": "protoc-compile"}
     }
@@ -277,8 +285,8 @@
           , "$1": {"type": "FIELD", "name": "stage"}
           }
         ]
-      , ["public-fieldnames", ["deps", "proto-defaults"]]
-      , ["private-fieldnames", ["deps", "proto-defaults"]]
+      , ["public-fieldnames", ["deps", "proto-defaults", "defaults"]]
+      , ["private-fieldnames", ["deps", "proto-defaults", "defaults"]]
       ]
     , "body": {"type": "CALL_EXPRESSION", "name": "protoc-compile"}
     }
diff --git a/rules/CC/test/EXPRESSIONS b/rules/CC/test/EXPRESSIONS
new file mode 100644
index 0000000..e1442c5
--- /dev/null
+++ b/rules/CC/test/EXPRESSIONS
@@ -0,0 +1,303 @@
+{ "run_test":
+  { "doc":
+    [ "Build and run a CC test binary using the provided runner."
+    , ""
+    , "Note that if variable RUNS_PER_TEST contains a non-false value, a"
+    , "summarizer must be provided."
+    ]
+  , "vars":
+    [ "ARCH"
+    , "HOST_ARCH"
+    , "CC"
+    , "CXX"
+    , "CFLAGS"
+    , "CXXFLAGS"
+    , "ADD_CFLAGS"
+    , "ADD_CXXFLAGS"
+    , "ENV"
+    , "TEST_ENV"
+    , "CC_TEST_LAUNCHER"
+    , "RUNS_PER_TEST"
+    , "name"
+    , "pure C"
+    , "stage"
+    , "srcs"
+    , "private-hdrs"
+    , "private-defines"
+    , "private-cflags"
+    , "private-ldflags"
+    , "defaults-transition"
+    , "deps-transition"
+    , "deps-fieldnames"
+    , "runner"
+    , "runner-data"
+    , "test-args"
+    , "test-data"
+    , "summarizer"
+    ]
+  , "imports":
+    { "artifacts": ["./", "../..", "field_artifacts"]
+    , "runfiles": ["./", "../..", "field_runfiles"]
+    , "compile-deps": ["./", "..", "compile-deps"]
+    , "compile-args-deps": ["./", "..", "compile-args-deps"]
+    , "link-deps": ["./", "..", "link-deps"]
+    , "link-args-deps": ["./", "..", "link-args-deps"]
+    , "run-libs-deps": ["./", "..", "run-libs-deps"]
+    , "run-libs-args-deps": ["./", "..", "run-libs-args-deps"]
+    , "cflags-files-deps": ["./", "..", "cflags-files-deps"]
+    , "ldflags-files-deps": ["./", "..", "ldflags-files-deps"]
+    , "binary": ["./", "..", "bin artifact"]
+    , "host transition": ["transitions", "for host"]
+    , "stage": ["./", "../..", "stage_singleton_field"]
+    }
+  , "expression":
+    { "type": "let*"
+    , "bindings":
+      [ [ "cflags-files"
+        , {"type": "CALL_EXPRESSION", "name": "cflags-files-deps"}
+        ]
+      , ["compile-deps", {"type": "CALL_EXPRESSION", "name": "compile-deps"}]
+      , [ "compile-args"
+        , { "type": "++"
+          , "$1":
+            [ { "type": "foreach"
+              , "var": "def"
+              , "range":
+                {"type": "var", "name": "private-defines", "default": []}
+              , "body":
+                {"type": "join", "$1": ["-D", {"type": "var", "name": "def"}]}
+              }
+            , {"type": "var", "name": "private-cflags", "default": []}
+            , {"type": "CALL_EXPRESSION", "name": "compile-args-deps"}
+            ]
+          }
+        ]
+      , [ "ldflags-files"
+        , {"type": "CALL_EXPRESSION", "name": "ldflags-files-deps"}
+        ]
+      , ["link-deps", {"type": "CALL_EXPRESSION", "name": "link-deps"}]
+      , [ "link-args"
+        , { "type": "++"
+          , "$1":
+            [ {"type": "CALL_EXPRESSION", "name": "link-args-deps"}
+            , {"type": "var", "name": "private-ldflags", "default": []}
+            ]
+          }
+        ]
+      , ["run-libs", {"type": "CALL_EXPRESSION", "name": "run-libs-deps"}]
+      , [ "run-libs-args"
+        , {"type": "CALL_EXPRESSION", "name": "run-libs-args-deps"}
+        ]
+      , ["binary", {"type": "CALL_EXPRESSION", "name": "binary"}]
+      , [ "staged test binary"
+        , { "type": "map_union"
+          , "$1":
+            { "type": "foreach_map"
+            , "range": {"type": "var", "name": "binary"}
+            , "var_val": "binary"
+            , "body":
+              { "type": "singleton_map"
+              , "key": "test"
+              , "value": {"type": "var", "name": "binary"}
+              }
+            }
+          }
+        ]
+      , [ "test-args"
+        , { "type": "singleton_map"
+          , "key": "test-args.json"
+          , "value":
+            { "type": "BLOB"
+            , "data":
+              { "type": "json_encode"
+              , "$1": {"type": "var", "name": "test-args", "default": []}
+              }
+            }
+          }
+        ]
+      , [ "test-launcher"
+        , { "type": "singleton_map"
+          , "key": "test-launcher.json"
+          , "value":
+            { "type": "BLOB"
+            , "data":
+              { "type": "json_encode"
+              , "$1":
+                {"type": "var", "name": "CC_TEST_LAUNCHER", "default": []}
+              }
+            }
+          }
+        ]
+      , [ "test-name"
+        , { "type": "join"
+          , "separator": "/"
+          , "$1":
+            [{"type": "var", "name": "stage"}, {"type": "var", "name": "name"}]
+          }
+        ]
+      , [ "test input"
+        , { "type": "map_union"
+          , "$1":
+            [ { "type": "to_subdir"
+              , "subdir": "work"
+              , "$1": {"type": "var", "name": "test-data"}
+              }
+            , {"type": "var", "name": "runner"}
+            , { "type": "var"
+              , "name": "runner-data"
+              , "default": {"type": "empty_map"}
+              }
+            , {"type": "var", "name": "test-args"}
+            , {"type": "var", "name": "test-launcher"}
+            , {"type": "var", "name": "staged test binary"}
+            , {"type": "var", "name": "run-libs"}
+            ]
+          }
+        ]
+      ]
+    , "body":
+      { "type": "if"
+      , "cond": {"type": "var", "name": "RUNS_PER_TEST"}
+      , "else":
+        { "type": "let*"
+        , "bindings":
+          [ [ "test-results"
+            , { "type": "ACTION"
+              , "outs":
+                ["result", "stdout", "stderr", "time-start", "time-stop"]
+              , "inputs": {"type": "var", "name": "test input"}
+              , "cmd": ["./runner"]
+              , "env":
+                { "type": "var"
+                , "name": "TEST_ENV"
+                , "default": {"type": "empty_map"}
+                }
+              , "may_fail": ["test"]
+              , "fail_message":
+                { "type": "join"
+                , "$1":
+                  ["CC test ", {"type": "var", "name": "test-name"}, " failed"]
+                }
+              }
+            ]
+          , [ "runfiles"
+            , { "type": "singleton_map"
+              , "key": {"type": "var", "name": "name"}
+              , "value":
+                {"type": "TREE", "$1": {"type": "var", "name": "test-results"}}
+              }
+            ]
+          ]
+        , "body":
+          { "type": "RESULT"
+          , "artifacts": {"type": "var", "name": "test-results"}
+          , "runfiles": {"type": "var", "name": "runfiles"}
+          }
+        }
+      , "then":
+        { "type": "let*"
+        , "bindings":
+          [ [ "attempts"
+            , { "type": "map_union"
+              , "$1":
+                { "type": "foreach"
+                , "var": "ATTEMPT"
+                , "range":
+                  { "type": "range"
+                  , "$1": {"type": "var", "name": "RUNS_PER_TEST"}
+                  }
+                , "body":
+                  { "type": "singleton_map"
+                  , "key": {"type": "var", "name": "ATTEMPT"}
+                  , "value":
+                    { "type": "TREE"
+                    , "$1":
+                      { "type": "ACTION"
+                      , "outs":
+                        [ "result"
+                        , "stdout"
+                        , "stderr"
+                        , "time-start"
+                        , "time-stop"
+                        ]
+                      , "inputs":
+                        { "type": "map_union"
+                        , "$1":
+                          [ { "type": "singleton_map"
+                            , "key": "ATTEMPT"
+                            , "value":
+                              { "type": "BLOB"
+                              , "data": {"type": "var", "name": "ATTEMPT"}
+                              }
+                            }
+                          , {"type": "var", "name": "test input"}
+                          ]
+                        }
+                      , "cmd": ["./runner"]
+                      , "env":
+                        { "type": "var"
+                        , "name": "TEST_ENV"
+                        , "default": {"type": "empty_map"}
+                        }
+                      , "may_fail": ["test"]
+                      , "no_cache": ["test"]
+                      , "fail_message":
+                        { "type": "join"
+                        , "$1":
+                          [ "CC test "
+                          , {"type": "var", "name": "test-name"}
+                          , " failed (Run"
+                          , {"type": "var", "name": "ATTEMPT"}
+                          , ")"
+                          ]
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            ]
+          , [ "summary"
+            , { "type": "ACTION"
+              , "inputs":
+                { "type": "map_union"
+                , "$1":
+                  [ {"type": "var", "name": "attempts"}
+                  , {"type": "var", "name": "summarizer"}
+                  ]
+                }
+              , "outs":
+                ["stdout", "stderr", "result", "time-start", "time-stop"]
+              , "cmd": ["./summarizer"]
+              }
+            ]
+          , [ "artifacts"
+            , { "type": "map_union"
+              , "$1":
+                [ {"type": "var", "name": "summary"}
+                , { "type": "singleton_map"
+                  , "key": "work"
+                  , "value":
+                    {"type": "TREE", "$1": {"type": "var", "name": "attempts"}}
+                  }
+                ]
+              }
+            ]
+          , [ "runfiles"
+            , { "type": "singleton_map"
+              , "key": {"type": "var", "name": "name"}
+              , "value":
+                {"type": "TREE", "$1": {"type": "var", "name": "artifacts"}}
+              }
+            ]
+          ]
+        , "body":
+          { "type": "RESULT"
+          , "artifacts": {"type": "var", "name": "artifacts"}
+          , "runfiles": {"type": "var", "name": "runfiles"}
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/rules/CC/test/RULES b/rules/CC/test/RULES
index af07210..8a985be 100644
--- a/rules/CC/test/RULES
+++ b/rules/CC/test/RULES
@@ -117,17 +117,9 @@
   , "imports":
     { "artifacts": ["./", "../..", "field_artifacts"]
     , "runfiles": ["./", "../..", "field_runfiles"]
-    , "compile-deps": ["./", "..", "compile-deps"]
-    , "compile-args-deps": ["./", "..", "compile-args-deps"]
-    , "link-deps": ["./", "..", "link-deps"]
-    , "link-args-deps": ["./", "..", "link-args-deps"]
-    , "run-libs-deps": ["./", "..", "run-libs-deps"]
-    , "run-libs-args-deps": ["./", "..", "run-libs-args-deps"]
-    , "cflags-files-deps": ["./", "..", "cflags-files-deps"]
-    , "ldflags-files-deps": ["./", "..", "ldflags-files-deps"]
-    , "binary": ["./", "..", "bin artifact"]
     , "host transition": ["transitions", "for host"]
     , "stage": ["./", "../..", "stage_singleton_field"]
+    , "run_test": "run_test"
     }
   , "config_transitions":
     { "defaults": [{"type": "CALL_EXPRESSION", "name": "host transition"}]
@@ -173,56 +165,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"]]
-      , [ "cflags-files"
-        , {"type": "CALL_EXPRESSION", "name": "cflags-files-deps"}
-        ]
-      , ["compile-deps", {"type": "CALL_EXPRESSION", "name": "compile-deps"}]
-      , [ "compile-args"
-        , { "type": "++"
-          , "$1":
-            [ { "type": "foreach"
-              , "var": "def"
-              , "range": {"type": "FIELD", "name": "private-defines"}
-              , "body":
-                {"type": "join", "$1": ["-D", {"type": "var", "name": "def"}]}
-              }
-            , {"type": "FIELD", "name": "private-cflags"}
-            , {"type": "CALL_EXPRESSION", "name": "compile-args-deps"}
-            ]
-          }
-        ]
-      , [ "ldflags-files"
-        , {"type": "CALL_EXPRESSION", "name": "ldflags-files-deps"}
-        ]
-      , ["link-deps", {"type": "CALL_EXPRESSION", "name": "link-deps"}]
-      , [ "link-args"
-        , { "type": "++"
-          , "$1":
-            [ {"type": "CALL_EXPRESSION", "name": "link-args-deps"}
-            , {"type": "FIELD", "name": "private-ldflags"}
-            ]
-          }
-        ]
-      , ["run-libs", {"type": "CALL_EXPRESSION", "name": "run-libs-deps"}]
-      , [ "run-libs-args"
-        , {"type": "CALL_EXPRESSION", "name": "run-libs-args-deps"}
-        ]
-      , ["binary", {"type": "CALL_EXPRESSION", "name": "binary"}]
-      , [ "staged test binary"
-        , { "type": "map_union"
-          , "$1":
-            { "type": "foreach_map"
-            , "range": {"type": "var", "name": "binary"}
-            , "var_val": "binary"
-            , "body":
-              { "type": "singleton_map"
-              , "key": "test"
-              , "value": {"type": "var", "name": "binary"}
-              }
-            }
-          }
-        ]
+      , ["deps-fieldnames", ["private-deps", "defaults"]]
       , [ "runner"
         , { "type": "map_union"
           , "$1":
@@ -251,32 +194,8 @@
             }
           }
         ]
-      , [ "test-args"
-        , { "type": "singleton_map"
-          , "key": "test-args.json"
-          , "value":
-            { "type": "BLOB"
-            , "data":
-              { "type": "json_encode"
-              , "$1": {"type": "FIELD", "name": "args", "default": []}
-              }
-            }
-          }
-        ]
-      , [ "test-launcher"
-        , { "type": "singleton_map"
-          , "key": "test-launcher.json"
-          , "value":
-            { "type": "BLOB"
-            , "data":
-              { "type": "json_encode"
-              , "$1":
-                {"type": "var", "name": "CC_TEST_LAUNCHER", "default": []}
-              }
-            }
-          }
-        ]
-      , [ "data"
+      , ["test-args", {"type": "FIELD", "name": "args", "default": []}]
+      , [ "test-data"
         , { "type": "let*"
           , "bindings":
             [ ["fieldname", "data"]
@@ -291,179 +210,15 @@
             }
           }
         ]
-      , [ "test-name"
-        , { "type": "join"
-          , "separator": "/"
-          , "$1":
-            [{"type": "var", "name": "stage"}, {"type": "var", "name": "name"}]
-          }
-        ]
-      , [ "test input"
-        , { "type": "map_union"
-          , "$1":
-            [ { "type": "to_subdir"
-              , "subdir": "work"
-              , "$1": {"type": "var", "name": "data"}
-              }
-            , {"type": "var", "name": "runner"}
-            , {"type": "var", "name": "test-args"}
-            , {"type": "var", "name": "test-launcher"}
-            , {"type": "var", "name": "staged test binary"}
-            , {"type": "var", "name": "run-libs"}
-            ]
+      , [ "summarizer"
+        , { "type": "let*"
+          , "bindings":
+            [["fieldname", "summarizer"], ["location", "summarizer"]]
+          , "body": {"type": "CALL_EXPRESSION", "name": "stage"}
           }
         ]
       ]
-    , "body":
-      { "type": "if"
-      , "cond": {"type": "var", "name": "RUNS_PER_TEST"}
-      , "else":
-        { "type": "let*"
-        , "bindings":
-          [ [ "test-results"
-            , { "type": "ACTION"
-              , "outs":
-                ["result", "stdout", "stderr", "time-start", "time-stop"]
-              , "inputs": {"type": "var", "name": "test input"}
-              , "cmd": ["./runner"]
-              , "env":
-                { "type": "var"
-                , "name": "TEST_ENV"
-                , "default": {"type": "empty_map"}
-                }
-              , "may_fail": ["test"]
-              , "fail_message":
-                { "type": "join"
-                , "$1":
-                  ["CC test ", {"type": "var", "name": "test-name"}, " failed"]
-                }
-              }
-            ]
-          , [ "runfiles"
-            , { "type": "singleton_map"
-              , "key": {"type": "var", "name": "name"}
-              , "value":
-                {"type": "TREE", "$1": {"type": "var", "name": "test-results"}}
-              }
-            ]
-          ]
-        , "body":
-          { "type": "RESULT"
-          , "artifacts": {"type": "var", "name": "test-results"}
-          , "runfiles": {"type": "var", "name": "runfiles"}
-          }
-        }
-      , "then":
-        { "type": "let*"
-        , "bindings":
-          [ [ "attempts"
-            , { "type": "map_union"
-              , "$1":
-                { "type": "foreach"
-                , "var": "ATTEMPT"
-                , "range":
-                  { "type": "range"
-                  , "$1": {"type": "var", "name": "RUNS_PER_TEST"}
-                  }
-                , "body":
-                  { "type": "singleton_map"
-                  , "key": {"type": "var", "name": "ATTEMPT"}
-                  , "value":
-                    { "type": "TREE"
-                    , "$1":
-                      { "type": "ACTION"
-                      , "outs":
-                        [ "result"
-                        , "stdout"
-                        , "stderr"
-                        , "time-start"
-                        , "time-stop"
-                        ]
-                      , "inputs":
-                        { "type": "map_union"
-                        , "$1":
-                          [ { "type": "singleton_map"
-                            , "key": "ATTEMPT"
-                            , "value":
-                              { "type": "BLOB"
-                              , "data": {"type": "var", "name": "ATTEMPT"}
-                              }
-                            }
-                          , {"type": "var", "name": "test input"}
-                          ]
-                        }
-                      , "cmd": ["./runner"]
-                      , "env":
-                        { "type": "var"
-                        , "name": "TEST_ENV"
-                        , "default": {"type": "empty_map"}
-                        }
-                      , "may_fail": ["test"]
-                      , "no_cache": ["test"]
-                      , "fail_message":
-                        { "type": "join"
-                        , "$1":
-                          [ "CC test "
-                          , {"type": "var", "name": "test-name"}
-                          , " failed (Run"
-                          , {"type": "var", "name": "ATTEMPT"}
-                          , ")"
-                          ]
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            ]
-          , [ "summarizer"
-            , { "type": "let*"
-              , "bindings":
-                [["fieldname", "summarizer"], ["location", "summarizer"]]
-              , "body": {"type": "CALL_EXPRESSION", "name": "stage"}
-              }
-            ]
-          , [ "summary"
-            , { "type": "ACTION"
-              , "inputs":
-                { "type": "map_union"
-                , "$1":
-                  [ {"type": "var", "name": "attempts"}
-                  , {"type": "var", "name": "summarizer"}
-                  ]
-                }
-              , "outs":
-                ["stdout", "stderr", "result", "time-start", "time-stop"]
-              , "cmd": ["./summarizer"]
-              }
-            ]
-          , [ "artifacts"
-            , { "type": "map_union"
-              , "$1":
-                [ {"type": "var", "name": "summary"}
-                , { "type": "singleton_map"
-                  , "key": "work"
-                  , "value":
-                    {"type": "TREE", "$1": {"type": "var", "name": "attempts"}}
-                  }
-                ]
-              }
-            ]
-          , [ "runfiles"
-            , { "type": "singleton_map"
-              , "key": {"type": "var", "name": "name"}
-              , "value":
-                {"type": "TREE", "$1": {"type": "var", "name": "artifacts"}}
-              }
-            ]
-          ]
-        , "body":
-          { "type": "RESULT"
-          , "artifacts": {"type": "var", "name": "artifacts"}
-          , "runfiles": {"type": "var", "name": "runfiles"}
-          }
-        }
-      }
+    , "body": {"type": "CALL_EXPRESSION", "name": "run_test"}
     }
   }
 }