5 files changed, 73 insertions, 8 deletions
diff --git a/etc/defaults/CC/TARGETS.curl b/etc/defaults/CC/TARGETS.curl
index 1bf560d1..233c3b6f 100644
--- a/etc/defaults/CC/TARGETS.curl
+++ b/etc/defaults/CC/TARGETS.curl
@@ -1,6 +1,7 @@
 { "defaults":
   { "type": ["CC", "defaults"]
-  , "arguments_config": ["COMPILER_FAMILY", "CURL_ENABLE_SSL"]
+  , "arguments_config":
+    ["COMPILER_FAMILY", "CURL_ENABLE_SSL", "ARCH", "TARGET_ARCH"]
   , "base": [["@", "base", "CC", "defaults"]]
   , "ADD_CFLAGS":
     { "type": "let*"
@@ -11,6 +12,17 @@
       , [ "CURL_ENABLE_SSL"
         , {"type": "var", "name": "CURL_ENABLE_SSL", "default": true}
         ]
+      , [ "TARGET_ARCH"
+        , { "type": "var"
+          , "name": "TARGET_ARCH"
+          , "default":
+            { "type": "var"
+            , "name": "ARCH"
+            , "default":
+              {"type": "fail", "msg": "Required variable 'ARCH' is not set."}
+            }
+          }
+        ]
       ]
     , "body":
       { "type": "++"
@@ -50,6 +62,10 @@
               }
             }
           }
+        , { "type": "case"
+          , "expr": {"type": "var", "name": "TARGET_ARCH"}
+          , "case": {"arm": ["-Wno-atomic-alignment"]}
+          }
         ]
       }
     }
diff --git a/etc/defaults/CC/TARGETS.protobuf b/etc/defaults/CC/TARGETS.protobuf
index 631eb670..ed80cbdd 100644
--- a/etc/defaults/CC/TARGETS.protobuf
+++ b/etc/defaults/CC/TARGETS.protobuf
@@ -33,6 +33,13 @@
               , "/wd4800"
               , "/wd4996"
               ]
+            , "gnu":
+              [ "-Wall"
+              , "-Wno-sign-compare"
+              , "-Wno-sign-conversion"
+              , "-Wno-unused-function"
+              , "-Wno-deprecated-declarations"
+              ]
             }
           , "default":
             [ "-Wall"
diff --git a/etc/import/absl/debugging/TARGETS.absl b/etc/import/absl/debugging/TARGETS.absl
index 56212eb8..1088c738 100644
--- a/etc/import/absl/debugging/TARGETS.absl
+++ b/etc/import/absl/debugging/TARGETS.absl
@@ -12,6 +12,20 @@
     , "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":
diff --git a/etc/import/src/google/protobuf/TARGETS.protobuf b/etc/import/src/google/protobuf/TARGETS.protobuf
index 0839c1c2..1fed9c43 100644
--- a/etc/import/src/google/protobuf/TARGETS.protobuf
+++ b/etc/import/src/google/protobuf/TARGETS.protobuf
@@ -270,15 +270,28 @@
   }
 , "libprotobuf_lite":
   { "type": ["@", "rules", "CC", "library"]
+  , "arguments_config": ["COMPILER_FAMILY"]
   , "name": ["protobuf-lite"]
   , "cflags":
-    [ "-Wno-sign-compare"
-    , "-Wno-sign-conversion"
-    , "-Wno-unused-function"
-    , "-Wno-zero-length-array"
-    , "-Wno-deprecated-declarations"
-    , "-Wno-invalid-noreturn"
-    ]
+    { "type": "case"
+    , "expr": {"type": "var", "name": "COMPILER_FAMILY", "default": "unknown"}
+    , "case":
+      { "gnu":
+        [ "-Wno-sign-compare"
+        , "-Wno-sign-conversion"
+        , "-Wno-unused-function"
+        , "-Wno-deprecated-declarations"
+        ]
+      }
+    , "default":
+      [ "-Wno-sign-compare"
+      , "-Wno-sign-conversion"
+      , "-Wno-unused-function"
+      , "-Wno-zero-length-array"
+      , "-Wno-deprecated-declarations"
+      , "-Wno-invalid-noreturn"
+      ]
+    }
   , "hdrs": ["protobuf_headers"]
   , "srcs":
     [ "any_lite.cc"
diff --git a/etc/import/third_party/upb/TARGETS.grpc b/etc/import/third_party/upb/TARGETS.grpc
index 03b76dd4..a7356621 100644
--- a/etc/import/third_party/upb/TARGETS.grpc
+++ b/etc/import/third_party/upb/TARGETS.grpc
@@ -95,12 +95,27 @@
   }
 , "upb_reflection":
   { "type": ["@", "rules", "CC", "library"]
+  , "arguments_config": ["ARCH", "TARGET_ARCH"]
   , "name": ["upb_reflection"]
   , "pure C": ["YES"]
   , "hdrs":
     ["upb/def.h", "upb/def.hpp", "upb/reflection.h", "upb/reflection.hpp"]
   , "srcs": ["upb/def.c", "upb/reflection.c"]
   , "private-hdrs": ["upb/msg.h"]
+  , "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-type-limits"], "arm64": ["-Wno-type-limits"]}
+    }
   , "deps":
     [ "upb_collections"
     , "upb_mini_table"