6 files changed, 25 insertions, 75 deletions
diff --git a/etc/import/absl/base/TARGETS.absl b/etc/import/absl/base/TARGETS.absl
index 90e1b579..fcc6bc78 100644
--- a/etc/import/absl/base/TARGETS.absl
+++ b/etc/import/absl/base/TARGETS.absl
@@ -60,22 +60,17 @@
           }
         , "case": [["mingw", ["-ladvapi32"]]]
         }
-      , { "type": "case*"
-        , "expr": {"type": "var", "name": "OS"}
-        , "case": [["linux", ["-lrt"]]]
+      , { "type": "case"
+        , "expr": {"type": "var", "name": "OS", "default": "linux"}
+        , "case": {"linux": ["-lrt"]}
         }
       , { "type": "case"
         , "expr":
           { "type": "var"
           , "name": "TARGET_ARCH"
-          , "default":
-            { "type": "var"
-            , "name": "ARCH"
-            , "default":
-              {"type": "fail", "msg": "Required variable 'ARCH' is not set."}
-            }
+          , "default": {"type": "var", "name": "ARCH", "default": "unknown"}
           }
-        , "case": {"arm": ["-latomic"]}
+        , "case": {"arm": ["-latomic"], "unknown": ["-latomic"]}
         }
       ]
     }
@@ -103,14 +98,9 @@
     , "expr":
       { "type": "var"
       , "name": "TARGET_ARCH"
-      , "default":
-        { "type": "var"
-        , "name": "ARCH"
-        , "default":
-          {"type": "fail", "msg": "Required variable 'ARCH' is not set."}
-        }
+      , "default": {"type": "var", "name": "ARCH", "default": "unknown"}
       }
-    , "case": {"arm": ["-latomic"]}
+    , "case": {"arm": ["-latomic"], "unknown": ["-latomic"]}
     }
   , "deps": ["config", "core_headers"]
   }
@@ -263,14 +253,9 @@
     , "expr":
       { "type": "var"
       , "name": "TARGET_ARCH"
-      , "default":
-        { "type": "var"
-        , "name": "ARCH"
-        , "default":
-          {"type": "fail", "msg": "Required variable 'ARCH' is not set."}
-        }
+      , "default": {"type": "var", "name": "ARCH", "default": "unknown"}
       }
-    , "case": {"arm": ["-latomic"]}
+    , "case": {"arm": ["-latomic"], "unknown": ["-latomic"]}
     }
   , "deps":
     ["atomic_hook", "config", "core_headers", "errno_saver", "log_severity"]
@@ -341,14 +326,9 @@
         , "expr":
           { "type": "var"
           , "name": "TARGET_ARCH"
-          , "default":
-            { "type": "var"
-            , "name": "ARCH"
-            , "default":
-              {"type": "fail", "msg": "Required variable 'ARCH' is not set."}
-            }
+          , "default": {"type": "var", "name": "ARCH", "default": "unknown"}
           }
-        , "case": {"arm": ["-latomic"]}
+        , "case": {"arm": ["-latomic"], "unknown": ["-latomic"]}
         }
       ]
     }
diff --git a/etc/import/absl/debugging/TARGETS.absl b/etc/import/absl/debugging/TARGETS.absl
index 56cd8da6..f7052bc3 100644
--- a/etc/import/absl/debugging/TARGETS.absl
+++ b/etc/import/absl/debugging/TARGETS.absl
@@ -12,20 +12,6 @@
     , "symbolize_unimplemented.inc"
     , "symbolize_win32.inc"
     ]
-  , "private-cflags":
-    { "type": "case"
-    , "expr":
-      { "type": "var"
-      , "name": "TARGET_ARCH"
-      , "default":
-        { "type": "var"
-        , "name": "ARCH"
-        , "default":
-          {"type": "fail", "msg": "Required variable 'ARCH' is not set."}
-        }
-      }
-    , "case": {"arm": ["-Wno-sign-conversion"]}
-    }
   , "private-ldflags":
     { "type": "++"
     , "$1":
@@ -45,14 +31,9 @@
         , "expr":
           { "type": "var"
           , "name": "TARGET_ARCH"
-          , "default":
-            { "type": "var"
-            , "name": "ARCH"
-            , "default":
-              {"type": "fail", "msg": "Required variable 'ARCH' is not set."}
-            }
+          , "default": {"type": "var", "name": "ARCH", "default": "unknown"}
           }
-        , "case": {"arm": ["-latomic"]}
+        , "case": {"arm": ["-latomic"], "unknown": ["-latomic"]}
         }
       ]
     }
diff --git a/etc/import/absl/random/TARGETS.absl b/etc/import/absl/random/TARGETS.absl
index c32ecb3a..db5b83ee 100644
--- a/etc/import/absl/random/TARGETS.absl
+++ b/etc/import/absl/random/TARGETS.absl
@@ -354,13 +354,17 @@
 , "internal_randen_hwaes_impl":
   { "type": ["@", "rules", "CC", "library"]
   , "name": ["internal_randen_hwaes_impl"]
-  , "arguments_config": ["TARGET_ARCH", "TOOLCHAIN_CONFIG"]
+  , "arguments_config": ["ARCH", "TARGET_ARCH", "TOOLCHAIN_CONFIG"]
   , "stage": ["absl", "random"]
   , "private-hdrs": ["internal/randen_hwaes.h"]
   , "srcs": ["internal/randen_hwaes.cc"]
   , "private-cflags":
     { "type": "case*"
-    , "expr": {"type": "var", "name": "TARGET_ARCH"}
+    , "expr":
+      { "type": "var"
+      , "name": "TARGET_ARCH"
+      , "default": {"type": "var", "name": "ARCH"}
+      }
     , "case":
       [ ["arm", ["-mfpu=neon"]]
       , ["arm64", ["-march=armv8-a+crypto"]]
diff --git a/etc/import/absl/strings/TARGETS.absl b/etc/import/absl/strings/TARGETS.absl
index 129a48f6..ea989bc1 100644
--- a/etc/import/absl/strings/TARGETS.absl
+++ b/etc/import/absl/strings/TARGETS.absl
@@ -239,14 +239,9 @@
     , "expr":
       { "type": "var"
       , "name": "TARGET_ARCH"
-      , "default":
-        { "type": "var"
-        , "name": "ARCH"
-        , "default":
-          {"type": "fail", "msg": "Required variable 'ARCH' is not set."}
-        }
+      , "default": {"type": "var", "name": "ARCH", "default": "unknown"}
       }
-    , "case": {"arm": ["-latomic"]}
+    , "case": {"arm": ["-latomic"], "unknown": ["-latomic"]}
     }
   , "deps":
     [ "cord_internal"
diff --git a/etc/import/absl/synchronization/TARGETS.absl b/etc/import/absl/synchronization/TARGETS.absl
index 3ca1d759..84a1a964 100644
--- a/etc/import/absl/synchronization/TARGETS.absl
+++ b/etc/import/absl/synchronization/TARGETS.absl
@@ -50,14 +50,9 @@
         , "expr":
           { "type": "var"
           , "name": "TARGET_ARCH"
-          , "default":
-            { "type": "var"
-            , "name": "ARCH"
-            , "default":
-              {"type": "fail", "msg": "Required variable 'ARCH' is not set."}
-            }
+          , "default": {"type": "var", "name": "ARCH", "default": "unknown"}
           }
-        , "case": {"arm": ["-latomic"]}
+        , "case": {"arm": ["-latomic"], "unknown": ["-latomic"]}
         }
       ]
     }
diff --git a/etc/import/absl/time/TARGETS.absl b/etc/import/absl/time/TARGETS.absl
index aafe343f..54d87595 100644
--- a/etc/import/absl/time/TARGETS.absl
+++ b/etc/import/absl/time/TARGETS.absl
@@ -86,14 +86,9 @@
     , "expr":
       { "type": "var"
       , "name": "TARGET_ARCH"
-      , "default":
-        { "type": "var"
-        , "name": "ARCH"
-        , "default":
-          {"type": "fail", "msg": "Required variable 'ARCH' is not set."}
-        }
+      , "default": {"type": "var", "name": "ARCH", "default": "unknown"}
       }
-    , "case": {"arm": ["-latomic"]}
+    , "case": {"arm": ["-latomic"], "unknown": ["-latomic"]}
     }
   , "deps": ["civil_time", ["absl/base", "config"]]
   }