3 files changed, 97 insertions, 50 deletions
diff --git a/etc/defaults/CC/TARGETS.boringssl b/etc/defaults/CC/TARGETS.boringssl
index f517587b..2466c2d8 100644
--- a/etc/defaults/CC/TARGETS.boringssl
+++ b/etc/defaults/CC/TARGETS.boringssl
@@ -9,7 +9,21 @@
       [ ["-std=gnu17", "-O2"]
       , { "type": "let*"
         , "bindings":
-          [ [ "PLATFORM"
+          [ [ "OS"
+            , { "type": "var"
+              , "name": "OS"
+              , "default":
+                {"type": "fail", "msg": "Required variable 'OS' is not set."}
+              }
+            ]
+          , [ "ARCH"
+            , { "type": "var"
+              , "name": "ARCH"
+              , "default":
+                {"type": "fail", "msg": "Required variable 'ARCH' is not set."}
+              }
+            ]
+          , [ "PLATFORM"
             , { "type": "join"
               , "separator": "_"
               , "$1":
diff --git a/etc/defaults/CC/TARGETS.git2 b/etc/defaults/CC/TARGETS.git2
index 158d93e4..056b745e 100644
--- a/etc/defaults/CC/TARGETS.git2
+++ b/etc/defaults/CC/TARGETS.git2
@@ -1,60 +1,79 @@
 { "defaults":
   { "type": ["CC", "defaults"]
-  , "arguments_config": ["OS"]
+  , "arguments_config": ["OS", "ARCH"]
   , "CC": ["clang"]
   , "CXX": ["clang++"]
   , "CFLAGS":
-    { "type": "++"
-    , "$1":
-      [ ["-std=gnu17", "-O2"]
-      , { "type": "case"
-        , "expr": {"type": "var", "name": "OS"}
-        , "case":
-          { "windows":
-            [ "-D_SCL_SECURE_NO_WARNINGS"
-            , "-D_CRT_SECURE_NO_DEPRECATE"
-            , "-D_CRT_NONSTDC_NO_DEPRECATE"
-            , "/GF"
-            , "/MP"
-            , "/nologo"
-            ]
+    { "type": "let*"
+    , "bindings":
+      [ [ "OS"
+        , { "type": "var"
+          , "name": "OS"
+          , "default":
+            {"type": "fail", "msg": "Required variable 'OS' is not set."}
           }
-        , "default":
-          { "type": "++"
-          , "$1":
-            [ ["-D_GNU_SOURCE", "-Wall", "-Wextra"]
-            , { "type": "case"
-              , "expr": {"type": "var", "name": "OS"}
-              , "case":
-                { "sunos":
-                  [ "-D_POSIX_C_SOURCE=200112L"
-                  , "-D__EXTENSIONS__"
-                  , "-D_POSIX_PTHREAD_SEMANTICS"
-                  ]
-                , "solaris":
-                  [ "-D_POSIX_C_SOURCE=200112L"
-                  , "-D__EXTENSIONS__"
-                  , "-D_POSIX_PTHREAD_SEMANTICS"
-                  ]
+        ]
+      , [ "ARCH"
+        , { "type": "var"
+          , "name": "ARCH"
+          , "default":
+            {"type": "fail", "msg": "Required variable 'ARCH' is not set."}
+          }
+        ]
+      ]
+    , "body":
+      { "type": "++"
+      , "$1":
+        [ ["-std=gnu17", "-O2"]
+        , { "type": "case"
+          , "expr": {"type": "var", "name": "OS"}
+          , "case":
+            { "windows":
+              [ "-D_SCL_SECURE_NO_WARNINGS"
+              , "-D_CRT_SECURE_NO_DEPRECATE"
+              , "-D_CRT_NONSTDC_NO_DEPRECATE"
+              , "/GF"
+              , "/MP"
+              , "/nologo"
+              ]
+            }
+          , "default":
+            { "type": "++"
+            , "$1":
+              [ ["-D_GNU_SOURCE", "-Wall", "-Wextra"]
+              , { "type": "case"
+                , "expr": {"type": "var", "name": "OS"}
+                , "case":
+                  { "sunos":
+                    [ "-D_POSIX_C_SOURCE=200112L"
+                    , "-D__EXTENSIONS__"
+                    , "-D_POSIX_PTHREAD_SEMANTICS"
+                    ]
+                  , "solaris":
+                    [ "-D_POSIX_C_SOURCE=200112L"
+                    , "-D__EXTENSIONS__"
+                    , "-D_POSIX_PTHREAD_SEMANTICS"
+                    ]
+                  }
                 }
-              }
-            , [ "-Wdocumentation"
-              , "-Wno-documentation-deprecated-sync"
-              , "-Wno-missing-field-initializers"
-              , "-Wstrict-aliasing"
-              , "-Wstrict-prototypes"
-              , "-Wdeclaration-after-statement"
-              , "-Wshift-count-overflow"
-              , "-Wunused-const-variable"
-              , "-Wunused-function"
-              , "-Wint-conversion"
-              , "-Wformat"
-              , "-Wformat-security"
+              , [ "-Wdocumentation"
+                , "-Wno-documentation-deprecated-sync"
+                , "-Wno-missing-field-initializers"
+                , "-Wstrict-aliasing"
+                , "-Wstrict-prototypes"
+                , "-Wdeclaration-after-statement"
+                , "-Wshift-count-overflow"
+                , "-Wunused-const-variable"
+                , "-Wunused-function"
+                , "-Wint-conversion"
+                , "-Wformat"
+                , "-Wformat-security"
+                ]
               ]
-            ]
+            }
           }
-        }
-      ]
+        ]
+      }
     }
   , "CXXFLAGS": []
   , "AR": ["ar"]
diff --git a/etc/import/third_party/TARGETS.grpc b/etc/import/third_party/TARGETS.grpc
index 47026121..c8addd16 100644
--- a/etc/import/third_party/TARGETS.grpc
+++ b/etc/import/third_party/TARGETS.grpc
@@ -7,7 +7,21 @@
     { "ares_config.h":
       { "type": "let*"
       , "bindings":
-        [ [ "PLATFORM"
+        [ [ "OS"
+          , { "type": "var"
+            , "name": "OS"
+            , "default":
+              {"type": "fail", "msg": "Required variable 'OS' is not set."}
+            }
+          ]
+        , [ "ARCH"
+          , { "type": "var"
+            , "name": "ARCH"
+            , "default":
+              {"type": "fail", "msg": "Required variable 'ARCH' is not set."}
+            }
+          ]
+        , [ "PLATFORM"
           , { "type": "join"
             , "separator": "_"
             , "$1":