3 files changed, 49 insertions, 8 deletions
diff --git a/etc/import/src/TARGETS.archive b/etc/import/src/TARGETS.archive
index ee3ff78b..b71c4f89 100644
--- a/etc/import/src/TARGETS.archive
+++ b/etc/import/src/TARGETS.archive
@@ -520,13 +520,21 @@
   }
 , "archive_hidden_symbols":
   { "type": ["@", "rules", "CC", "library"]
-  , "arguments_config": ["COMPILER_FAMILY", "HIDE_SYMBOLS"]
+  , "arguments_config": ["TOOLCHAIN_CONFIG", "HIDE_SYMBOLS"]
   , "name": ["archive_hidden_symbols"]
   , "private-ldflags":
     { "type": "if"
     , "cond":
       { "type": "=="
-      , "$1": {"type": "var", "name": "COMPILER_FAMILY"}
+      , "$1":
+        { "type": "lookup"
+        , "map":
+          { "type": "var"
+          , "name": "TOOLCHAIN_CONFIG"
+          , "default": {"type": "empty_map"}
+          }
+        , "key": "FAMILY"
+        }
       , "$2": "msvc"
       }
     , "then": []
@@ -535,7 +543,15 @@
       , "cond": {"type": "var", "name": "HIDE_SYMBOLS"}
       , "then":
         { "type": "case*"
-        , "expr": {"type": "var", "name": "COMPILER_FAMILY"}
+        , "expr":
+          { "type": "lookup"
+          , "map":
+            { "type": "var"
+            , "name": "TOOLCHAIN_CONFIG"
+            , "default": {"type": "empty_map"}
+            }
+          , "key": "FAMILY"
+          }
         , "case":
           [ ["clang", ["-fvisibility=hidden"]]
           , ["gnu", ["-fvisibility=hidden"]]
diff --git a/etc/import/src/TARGETS.curl b/etc/import/src/TARGETS.curl
index 1bfd750a..29fd9706 100644
--- a/etc/import/src/TARGETS.curl
+++ b/etc/import/src/TARGETS.curl
@@ -429,13 +429,21 @@
   }
 , "curl_hidden_symbols":
   { "type": ["@", "rules", "CC", "library"]
-  , "arguments_config": ["COMPILER_FAMILY", "CURL_HIDDEN_SYMBOLS"]
+  , "arguments_config": ["TOOLCHAIN_CONFIG", "CURL_HIDDEN_SYMBOLS"]
   , "name": ["curl_hidden_symbols"]
   , "private-ldflags":
     { "type": "if"
     , "cond":
       { "type": "=="
-      , "$1": {"type": "var", "name": "COMPILER_FAMILY"}
+      , "$1":
+        { "type": "lookup"
+        , "map":
+          { "type": "var"
+          , "name": "TOOLCHAIN_CONFIG"
+          , "default": {"type": "empty_map"}
+          }
+        , "key": "FAMILY"
+        }
       , "$2": "msvc"
       }
     , "then": []
@@ -444,7 +452,15 @@
       , "cond": {"type": "var", "name": "CURL_HIDDEN_SYMBOLS"}
       , "then":
         { "type": "case*"
-        , "expr": {"type": "var", "name": "COMPILER_FAMILY"}
+        , "expr":
+          { "type": "lookup"
+          , "map":
+            { "type": "var"
+            , "name": "TOOLCHAIN_CONFIG"
+            , "default": {"type": "empty_map"}
+            }
+          , "key": "FAMILY"
+          }
         , "case":
           [ ["clang", ["-fvisibility=hidden"]]
           , ["gnu", ["-fvisibility=hidden"]]
diff --git a/etc/import/src/google/protobuf/TARGETS.protobuf b/etc/import/src/google/protobuf/TARGETS.protobuf
index 0589f938..7add3c15 100644
--- a/etc/import/src/google/protobuf/TARGETS.protobuf
+++ b/etc/import/src/google/protobuf/TARGETS.protobuf
@@ -266,11 +266,20 @@
   }
 , "libprotobuf_lite":
   { "type": ["@", "rules", "CC", "library"]
-  , "arguments_config": ["COMPILER_FAMILY"]
+  , "arguments_config": ["TOOLCHAIN_CONFIG"]
   , "name": ["protobuf-lite"]
   , "cflags":
     { "type": "case"
-    , "expr": {"type": "var", "name": "COMPILER_FAMILY", "default": "unknown"}
+    , "expr":
+      { "type": "lookup"
+      , "map":
+        { "type": "var"
+        , "name": "TOOLCHAIN_CONFIG"
+        , "default": {"type": "empty_map"}
+        }
+      , "key": "FAMILY"
+      , "default": "unknown"
+      }
     , "case":
       { "gnu":
         [ "-Wno-sign-compare"