4 files changed, 35 insertions, 33 deletions
diff --git a/etc/import/TARGETS.boringssl b/etc/import/TARGETS.boringssl
index 5011581c..4b7f613e 100644
--- a/etc/import/TARGETS.boringssl
+++ b/etc/import/TARGETS.boringssl
@@ -613,27 +613,19 @@
         ]
       ]
     , "body":
-      { "type": "cond"
-      , "cond":
-        [ [ { "type": "=="
-            , "$1": {"type": "var", "name": "PLATFORM"}
-            , "$2": "linux_ppc64le"
-            }
-          , ["crypto_sources_linux_ppc64le"]
-          ]
-        , [ { "type": "=="
-            , "$1": {"type": "var", "name": "PLATFORM"}
-            , "$2": "linux_x86_64"
-            }
-          , ["crypto_sources_linux_x86_64"]
-          ]
-        , [ { "type": "=="
-            , "$1": {"type": "var", "name": "PLATFORM"}
-            , "$2": "mac_x86_64"
-            }
-          , ["crypto_sources_mac_x86_64"]
-          ]
-        ]
+      { "type": "case"
+      , "expr": {"type": "var", "name": "PLATFORM"}
+      , "case":
+        { "linux_x86": ["crypto_sources_linux_x86"]
+        , "linux_x86_64": ["crypto_sources_linux_x86_64"]
+        , "linux_arm": ["crypto_sources_linux_arm"]
+        , "linux_arm64": ["crypto_sources_linux_aarch64"]
+        , "linux_ppc64le": ["crypto_sources_linux_ppc64le"]
+        , "mac_x86": ["crypto_sources_mac_x86"]
+        , "mac_x86_64": ["crypto_sources_mac_x86_64"]
+        , "windows_x86": ["crypto_sources_win_x86"]
+        , "windows_x86_64": ["crypto_sources_win_x86_64"]
+        }
       }
     }
   }
diff --git a/etc/import/TARGETS.fmt b/etc/import/TARGETS.fmt
index a9434440..6f103b49 100644
--- a/etc/import/TARGETS.fmt
+++ b/etc/import/TARGETS.fmt
@@ -7,6 +7,7 @@
 , "fmt":
   { "type": "export"
   , "target": "fmt-lib"
-  , "flexible_config": ["CXX", "CXXFLAGS", "AR", "ENV"]
+  , "flexible_config":
+    ["OS", "ARCH", "TARGET_ARCH", "CXX", "CXXFLAGS", "AR", "ENV"]
   }
 }
diff --git a/etc/import/TARGETS.grpc b/etc/import/TARGETS.grpc
index 58c20d83..c4cdb362 100644
--- a/etc/import/TARGETS.grpc
+++ b/etc/import/TARGETS.grpc
@@ -153,6 +153,7 @@
   }
 , "grpc_base_c":
   { "type": ["@", "rules", "CC", "library"]
+  , "arguments_config": ["ARCH", "TARGET_ARCH"]
   , "name": ["grpc_base_c"]
   , "local cflags": ["-Wno-implicit-const-int-float-conversion"]
   , "srcs":
@@ -454,6 +455,15 @@
     , "src/core/lib/transport/transport_impl.h"
     , "src/core/lib/uri/uri_parser.h"
     ]
+  , "link external":
+    { "type": "case"
+    , "expr":
+      { "type": "var"
+      , "name": "TARGET_ARCH"
+      , "default": {"type": "var", "name": "ARCH"}
+      }
+    , "case": {"arm": ["-latomic"]}
+    }
   , "deps":
     [ "eventmanager_libuv"
     , "gpr_base"
diff --git a/etc/import/include/git2/TARGETS.git2 b/etc/import/include/git2/TARGETS.git2
index 923bb80f..ada9989f 100644
--- a/etc/import/include/git2/TARGETS.git2
+++ b/etc/import/include/git2/TARGETS.git2
@@ -118,18 +118,17 @@
             , "cond": {"type": "var", "name": "THREADSAFE"}
             , "then": ["#define GIT_THREADS 1"]
             }
-          , { "type": "if"
-            , "cond":
-              { "type": "=="
-              , "$1":
-                { "type": "var"
-                , "name": "TARGET_ARCH"
-                , "default": {"type": "var", "name": "ARCH"}
-                }
-              , "$2": "x86_64"
+          , { "type": "case"
+            , "expr":
+              { "type": "var"
+              , "name": "TARGET_ARCH"
+              , "default": {"type": "var", "name": "ARCH"}
+              }
+            , "case":
+              { "x86_64": ["#define GIT_ARCH_64 1"]
+              , "arm64": ["#define GIT_ARCH_64 1"]
               }
-            , "then": ["#define GIT_ARCH_64 1"]
-            , "else": ["#define GIT_ARCH_32 1"]
+            , "default": ["#define GIT_ARCH_32 1"]
             }
           , { "type": "if"
             , "cond": {"type": "var", "name": "USE_ICONV"}