diff --git a/3rdparty/crates/BUILD.bazel b/3rdparty/crates/BUILD.bazel
index 6f197bef..d8da6bc3 100644
--- a/3rdparty/crates/BUILD.bazel
+++ b/3rdparty/crates/BUILD.bazel
@@ -64,7 +64,7 @@ alias(
 
 alias(
     name = "clap",
-    actual = "@crate_index__clap-3.1.2//:clap",
+    actual = "@crate_index__clap-3.1.3//:clap",
     tags = ["manual"],
 )
 
diff --git a/3rdparty/crates/BUILD.clap-3.1.2.bazel b/3rdparty/crates/BUILD.clap-3.1.3.bazel
similarity index 99%
rename from 3rdparty/crates/BUILD.clap-3.1.2.bazel
rename to 3rdparty/crates/BUILD.clap-3.1.3.bazel
index 439c719e..8b5bfb9c 100644
--- a/3rdparty/crates/BUILD.clap-3.1.2.bazel
+++ b/3rdparty/crates/BUILD.clap-3.1.3.bazel
@@ -87,7 +87,7 @@ rust_library(
         "noclippy",
         "norustfmt",
     ],
-    version = "3.1.2",
+    version = "3.1.3",
     deps = [
     ] + select_with_or({
         "//conditions:default": [
diff --git a/3rdparty/crates/BUILD.cpufeatures-0.2.1.bazel b/3rdparty/crates/BUILD.cpufeatures-0.2.1.bazel
index c4ef9ea7..1515f3e5 100644
--- a/3rdparty/crates/BUILD.cpufeatures-0.2.1.bazel
+++ b/3rdparty/crates/BUILD.cpufeatures-0.2.1.bazel
@@ -79,10 +79,14 @@ rust_library(
     deps = [
     ] + select_with_or({
         # aarch64-apple-darwin
-        #
-        # No supported platform triples for cfg: 'aarch64-apple-darwin'
-        # Skipped dependencies: [{"id":"libc 0.2.119","target":"libc"}]
-        #
+        (
+            "@rules_rust//rust/platform:aarch64-apple-darwin",
+        ): [
+            # Target Deps
+            "@crate_index__libc-0.2.119//:libc",
+
+            # Common Deps
+        ],
         # cfg(all(target_arch = "aarch64", target_os = "linux"))
         (
             "@rules_rust//rust/platform:aarch64-unknown-linux-gnu",
diff --git a/3rdparty/crates/BUILD.crates-index-0.18.7.bazel b/3rdparty/crates/BUILD.crates-index-0.18.7.bazel
index 660d006e..748d3736 100644
--- a/3rdparty/crates/BUILD.crates-index-0.18.7.bazel
+++ b/3rdparty/crates/BUILD.crates-index-0.18.7.bazel
@@ -80,7 +80,7 @@ rust_library(
     deps = [
     ] + select_with_or({
         "//conditions:default": [
-            "@crate_index__git2-0.14.0//:git2",
+            "@crate_index__git2-0.14.1//:git2",
             "@crate_index__hex-0.4.3//:hex",
             "@crate_index__home-0.5.3//:home",
             "@crate_index__memchr-2.4.1//:memchr",
diff --git a/3rdparty/crates/BUILD.filetime-0.2.15.bazel b/3rdparty/crates/BUILD.filetime-0.2.15.bazel
index ab4b0add..f62145ad 100644
--- a/3rdparty/crates/BUILD.filetime-0.2.15.bazel
+++ b/3rdparty/crates/BUILD.filetime-0.2.15.bazel
@@ -81,7 +81,7 @@ rust_library(
         # cfg(target_os = "redox")
         #
         # No supported platform triples for cfg: 'cfg(target_os = "redox")'
-        # Skipped dependencies: [{"id":"redox_syscall 0.2.10","target":"syscall"}]
+        # Skipped dependencies: [{"id":"redox_syscall 0.2.11","target":"syscall"}]
         #
         # cfg(unix)
         (
diff --git a/3rdparty/crates/BUILD.git2-0.14.0.bazel b/3rdparty/crates/BUILD.git2-0.14.1.bazel
similarity index 96%
rename from 3rdparty/crates/BUILD.git2-0.14.0.bazel
rename to 3rdparty/crates/BUILD.git2-0.14.1.bazel
index 378be702..72ae70d8 100644
--- a/3rdparty/crates/BUILD.git2-0.14.0.bazel
+++ b/3rdparty/crates/BUILD.git2-0.14.1.bazel
@@ -75,13 +75,13 @@ rust_library(
         "noclippy",
         "norustfmt",
     ],
-    version = "0.14.0",
+    version = "0.14.1",
     deps = [
     ] + select_with_or({
         "//conditions:default": [
             "@crate_index__bitflags-1.3.2//:bitflags",
             "@crate_index__libc-0.2.119//:libc",
-            "@crate_index__libgit2-sys-0.13.0-1.4.1//:libgit2_sys",
+            "@crate_index__libgit2-sys-0.13.1-1.4.2//:libgit2_sys",
             "@crate_index__log-0.4.14//:log",
             "@crate_index__url-2.2.2//:url",
         ],
diff --git a/3rdparty/crates/BUILD.libgit2-sys-0.13.0+1.4.1.bazel b/3rdparty/crates/BUILD.libgit2-sys-0.13.1+1.4.2.bazel
similarity index 98%
rename from 3rdparty/crates/BUILD.libgit2-sys-0.13.0+1.4.1.bazel
rename to 3rdparty/crates/BUILD.libgit2-sys-0.13.1+1.4.2.bazel
index 6dc7a6a3..94bef6eb 100644
--- a/3rdparty/crates/BUILD.libgit2-sys-0.13.0+1.4.1.bazel
+++ b/3rdparty/crates/BUILD.libgit2-sys-0.13.1+1.4.2.bazel
@@ -75,7 +75,7 @@ rust_library(
         "noclippy",
         "norustfmt",
     ],
-    version = "0.13.0+1.4.1",
+    version = "0.13.1+1.4.2",
     deps = [
         "@libgit2",
     ] + select_with_or({
diff --git a/3rdparty/crates/BUILD.redox_syscall-0.2.10.bazel b/3rdparty/crates/BUILD.redox_syscall-0.2.11.bazel
similarity index 98%
rename from 3rdparty/crates/BUILD.redox_syscall-0.2.10.bazel
rename to 3rdparty/crates/BUILD.redox_syscall-0.2.11.bazel
index 355c5911..08872db4 100644
--- a/3rdparty/crates/BUILD.redox_syscall-0.2.10.bazel
+++ b/3rdparty/crates/BUILD.redox_syscall-0.2.11.bazel
@@ -75,7 +75,7 @@ rust_library(
         "noclippy",
         "norustfmt",
     ],
-    version = "0.2.10",
+    version = "0.2.11",
     deps = [
     ] + select_with_or({
         "//conditions:default": [
diff --git a/3rdparty/crates/BUILD.tempfile-3.3.0.bazel b/3rdparty/crates/BUILD.tempfile-3.3.0.bazel
index dad0dc57..4a7415ef 100644
--- a/3rdparty/crates/BUILD.tempfile-3.3.0.bazel
+++ b/3rdparty/crates/BUILD.tempfile-3.3.0.bazel
@@ -110,7 +110,7 @@ rust_library(
         # cfg(target_os = "redox")
         #
         # No supported platform triples for cfg: 'cfg(target_os = "redox")'
-        # Skipped dependencies: [{"id":"redox_syscall 0.2.10","target":"syscall"}]
+        # Skipped dependencies: [{"id":"redox_syscall 0.2.11","target":"syscall"}]
         #
         # cfg(windows)
         (
diff --git a/3rdparty/crates/defs.bzl b/3rdparty/crates/defs.bzl
index 1283259e..1c00f424 100644
--- a/3rdparty/crates/defs.bzl
+++ b/3rdparty/crates/defs.bzl
@@ -293,7 +293,7 @@ _NORMAL_DEPENDENCIES = {
             "cargo_metadata": "@crate_index__cargo_metadata-0.14.2//:cargo_metadata",
             "cargo_toml": "@crate_index__cargo_toml-0.11.4//:cargo_toml",
             "cfg-expr": "@crate_index__cfg-expr-0.10.2//:cfg_expr",
-            "clap": "@crate_index__clap-3.1.2//:clap",
+            "clap": "@crate_index__clap-3.1.3//:clap",
             "crates-index": "@crate_index__crates-index-0.18.7//:crates_index",
             "hex": "@crate_index__hex-0.4.3//:hex",
             "pathdiff": "@crate_index__pathdiff-0.2.1//:pathdiff",
@@ -310,7 +310,7 @@ _NORMAL_DEPENDENCIES = {
     },
     "tools/cross_installer": {
         _COMMON_CONDITION: {
-            "clap": "@crate_index__clap-3.1.2//:clap",
+            "clap": "@crate_index__clap-3.1.3//:clap",
         },
     },
     "tools/examples_runner": {
@@ -325,7 +325,7 @@ _NORMAL_DEPENDENCIES = {
     },
     "tools/urls_generator": {
         _COMMON_CONDITION: {
-            "clap": "@crate_index__clap-3.1.2//:clap",
+            "clap": "@crate_index__clap-3.1.3//:clap",
             "hex": "@crate_index__hex-0.4.3//:hex",
             "serde_json": "@crate_index__serde_json-1.0.79//:serde_json",
             "sha2": "@crate_index__sha2-0.10.2//:sha2",
@@ -470,15 +470,13 @@ _BUILD_PROC_MACRO_ALIASES = {
 }
 
 _CONDITIONS = {
+    "aarch64-apple-darwin": ["aarch64-apple-darwin"],
     "cfg(all(any(target_arch = \"x86_64\", target_arch = \"aarch64\"), target_os = \"hermit\"))": [],
     "cfg(all(target_arch = \"aarch64\", target_os = \"linux\"))": ["aarch64-unknown-linux-gnu"],
     "cfg(all(target_arch = \"wasm32\", not(target_os = \"emscripten\")))": ["wasm32-unknown-unknown", "wasm32-wasi"],
     "cfg(any(target_arch = \"aarch64\", target_arch = \"x86_64\", target_arch = \"x86\"))": ["aarch64-apple-darwin", "aarch64-apple-ios", "aarch64-linux-android", "aarch64-unknown-linux-gnu", "i686-apple-darwin", "i686-linux-android", "i686-pc-windows-msvc", "i686-unknown-freebsd", "i686-unknown-linux-gnu", "x86_64-apple-darwin", "x86_64-apple-ios", "x86_64-linux-android", "x86_64-pc-windows-msvc", "x86_64-unknown-freebsd", "x86_64-unknown-linux-gnu"],
     "cfg(any(unix, target_os = \"wasi\"))": ["aarch64-apple-darwin", "aarch64-apple-ios", "aarch64-linux-android", "aarch64-unknown-linux-gnu", "arm-unknown-linux-gnueabi", "armv7-unknown-linux-gnueabi", "i686-apple-darwin", "i686-linux-android", "i686-unknown-freebsd", "i686-unknown-linux-gnu", "powerpc-unknown-linux-gnu", "s390x-unknown-linux-gnu", "wasm32-wasi", "x86_64-apple-darwin", "x86_64-apple-ios", "x86_64-linux-android", "x86_64-unknown-freebsd", "x86_64-unknown-linux-gnu"],
     "cfg(not(windows))": ["aarch64-apple-darwin", "aarch64-apple-ios", "aarch64-linux-android", "aarch64-unknown-linux-gnu", "arm-unknown-linux-gnueabi", "armv7-unknown-linux-gnueabi", "i686-apple-darwin", "i686-linux-android", "i686-unknown-freebsd", "i686-unknown-linux-gnu", "powerpc-unknown-linux-gnu", "s390x-unknown-linux-gnu", "wasm32-unknown-unknown", "wasm32-wasi", "x86_64-apple-darwin", "x86_64-apple-ios", "x86_64-linux-android", "x86_64-unknown-freebsd", "x86_64-unknown-linux-gnu"],
-    "cfg(target = \"aarch64-apple-darwin\")": ["aarch64-apple-darwin"],
-    "cfg(target = \"i686-pc-windows-gnu\")": [],
-    "cfg(target = \"x86_64-pc-windows-gnu\")": [],
     "cfg(target_arch = \"wasm32\")": ["wasm32-unknown-unknown", "wasm32-wasi"],
     "cfg(target_env = \"sgx\")": [],
     "cfg(target_os = \"fuchsia\")": [],
@@ -487,6 +485,8 @@ _CONDITIONS = {
     "cfg(target_os = \"wasi\")": ["wasm32-wasi"],
     "cfg(unix)": ["aarch64-apple-darwin", "aarch64-apple-ios", "aarch64-linux-android", "aarch64-unknown-linux-gnu", "arm-unknown-linux-gnueabi", "armv7-unknown-linux-gnueabi", "i686-apple-darwin", "i686-linux-android", "i686-unknown-freebsd", "i686-unknown-linux-gnu", "powerpc-unknown-linux-gnu", "s390x-unknown-linux-gnu", "x86_64-apple-darwin", "x86_64-apple-ios", "x86_64-linux-android", "x86_64-unknown-freebsd", "x86_64-unknown-linux-gnu"],
     "cfg(windows)": ["i686-pc-windows-msvc", "x86_64-pc-windows-msvc"],
+    "i686-pc-windows-gnu": [],
+    "x86_64-pc-windows-gnu": [],
 }
 
 ###############################################################################
@@ -725,12 +725,12 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "crate_index__clap-3.1.2",
-        sha256 = "5177fac1ab67102d8989464efd043c6ff44191b1557ec1ddd489b4f7e1447e77",
+        name = "crate_index__clap-3.1.3",
+        sha256 = "86f8c0e2a6b902acc18214e24a6935cdaf8a8e34231913d4404dcaee659f65a1",
         type = "tar.gz",
-        urls = ["https://crates.io/api/v1/crates/clap/3.1.2/download"],
-        strip_prefix = "clap-3.1.2",
-        build_file = Label("@cargo_bazel//3rdparty/crates:BUILD.clap-3.1.2.bazel"),
+        urls = ["https://crates.io/api/v1/crates/clap/3.1.3/download"],
+        strip_prefix = "clap-3.1.3",
+        build_file = Label("@cargo_bazel//3rdparty/crates:BUILD.clap-3.1.3.bazel"),
     )
 
     maybe(
@@ -925,12 +925,12 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "crate_index__git2-0.14.0",
-        sha256 = "94781080dd1a6b55dea7c46540d5bac87742a22f6dc2d84e54a5071ad6f0e387",
+        name = "crate_index__git2-0.14.1",
+        sha256 = "6e7d3b96ec1fcaa8431cf04a4f1ef5caafe58d5cf7bcc31f09c1626adddb0ffe",
         type = "tar.gz",
-        urls = ["https://crates.io/api/v1/crates/git2/0.14.0/download"],
-        strip_prefix = "git2-0.14.0",
-        build_file = Label("@cargo_bazel//3rdparty/crates:BUILD.git2-0.14.0.bazel"),
+        urls = ["https://crates.io/api/v1/crates/git2/0.14.1/download"],
+        strip_prefix = "git2-0.14.1",
+        build_file = Label("@cargo_bazel//3rdparty/crates:BUILD.git2-0.14.1.bazel"),
     )
 
     maybe(
@@ -1095,12 +1095,12 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "crate_index__libgit2-sys-0.13.0-1.4.1",
-        sha256 = "864e22fc06cae62860398cd854c93d5867f11c02ec916aa1417b440f170df23a",
+        name = "crate_index__libgit2-sys-0.13.1-1.4.2",
+        sha256 = "43e598aa7a4faedf1ea1b4608f582b06f0f40211eec551b7ef36019ae3f62def",
         type = "tar.gz",
-        urls = ["https://crates.io/api/v1/crates/libgit2-sys/0.13.0+1.4.1/download"],
-        strip_prefix = "libgit2-sys-0.13.0+1.4.1",
-        build_file = Label("@cargo_bazel//3rdparty/crates:BUILD.libgit2-sys-0.13.0+1.4.1.bazel"),
+        urls = ["https://crates.io/api/v1/crates/libgit2-sys/0.13.1+1.4.2/download"],
+        strip_prefix = "libgit2-sys-0.13.1+1.4.2",
+        build_file = Label("@cargo_bazel//3rdparty/crates:BUILD.libgit2-sys-0.13.1+1.4.2.bazel"),
     )
 
     maybe(
@@ -1515,12 +1515,12 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "crate_index__redox_syscall-0.2.10",
-        sha256 = "8383f39639269cde97d255a32bdb68c047337295414940c68bdd30c2e13203ff",
+        name = "crate_index__redox_syscall-0.2.11",
+        sha256 = "8380fe0152551244f0747b1bf41737e0f8a74f97a14ccefd1148187271634f3c",
         type = "tar.gz",
-        urls = ["https://crates.io/api/v1/crates/redox_syscall/0.2.10/download"],
-        strip_prefix = "redox_syscall-0.2.10",
-        build_file = Label("@cargo_bazel//3rdparty/crates:BUILD.redox_syscall-0.2.10.bazel"),
+        urls = ["https://crates.io/api/v1/crates/redox_syscall/0.2.11/download"],
+        strip_prefix = "redox_syscall-0.2.11",
+        build_file = Label("@cargo_bazel//3rdparty/crates:BUILD.redox_syscall-0.2.11.bazel"),
     )
 
     maybe(
diff --git a/Cargo.Bazel.lock b/Cargo.Bazel.lock
index 94cf255d..73f884ef 100644
--- a/Cargo.Bazel.lock
+++ b/Cargo.Bazel.lock
@@ -1,5 +1,5 @@
 {
-  "checksum": "b0ee2334664153cd370e616a7370ae1a1b8d4add6cbc44d505e17a3598f172b3",
+  "checksum": "e73b619e7578cb410e3ca50bc96c703ca3638fc01d5ae1a8eb14f1b01998ec38",
   "crates": {
     "adler 1.0.2": {
       "name": "adler",
@@ -619,6 +619,10 @@
         "compile_data_glob": [
           "**"
         ],
+        "crate_features": [
+          "cargo",
+          "default"
+        ],
         "deps": {
           "common": [
             {
@@ -646,7 +650,7 @@
               "target": "cfg_expr"
             },
             {
-              "id": "clap 3.1.2",
+              "id": "clap 3.1.3",
               "target": "clap"
             },
             {
@@ -1267,13 +1271,13 @@
       },
       "license": "MIT/Apache-2.0"
     },
-    "clap 3.1.2": {
+    "clap 3.1.3": {
       "name": "clap",
-      "version": "3.1.2",
+      "version": "3.1.3",
       "repository": {
         "Http": {
-          "url": "https://crates.io/api/v1/crates/clap/3.1.2/download",
-          "sha256": "5177fac1ab67102d8989464efd043c6ff44191b1557ec1ddd489b4f7e1447e77"
+          "url": "https://crates.io/api/v1/crates/clap/3.1.3/download",
+          "sha256": "86f8c0e2a6b902acc18214e24a6935cdaf8a8e34231913d4404dcaee659f65a1"
         }
       },
       "targets": [
@@ -1355,7 +1359,7 @@
           ],
           "selects": {}
         },
-        "version": "3.1.2"
+        "version": "3.1.3"
       },
       "license": "MIT OR Apache-2.0"
     },
@@ -1501,7 +1505,7 @@
         "deps": {
           "common": [
             {
-              "id": "git2 0.14.0",
+              "id": "git2 0.14.1",
               "target": "git2"
             },
             {
@@ -1650,7 +1654,7 @@
         "deps": {
           "common": [
             {
-              "id": "clap 3.1.2",
+              "id": "clap 3.1.3",
               "target": "clap"
             }
           ],
@@ -2082,7 +2086,7 @@
           "selects": {
             "cfg(target_os = \"redox\")": [
               {
-                "id": "redox_syscall 0.2.10",
+                "id": "redox_syscall 0.2.11",
                 "target": "syscall"
               }
             ],
@@ -2462,13 +2466,13 @@
       },
       "license": "MIT OR Apache-2.0"
     },
-    "git2 0.14.0": {
+    "git2 0.14.1": {
       "name": "git2",
-      "version": "0.14.0",
+      "version": "0.14.1",
       "repository": {
         "Http": {
-          "url": "https://crates.io/api/v1/crates/git2/0.14.0/download",
-          "sha256": "94781080dd1a6b55dea7c46540d5bac87742a22f6dc2d84e54a5071ad6f0e387"
+          "url": "https://crates.io/api/v1/crates/git2/0.14.1/download",
+          "sha256": "6e7d3b96ec1fcaa8431cf04a4f1ef5caafe58d5cf7bcc31f09c1626adddb0ffe"
         }
       },
       "targets": [
@@ -2501,7 +2505,7 @@
               "target": "libc"
             },
             {
-              "id": "libgit2-sys 0.13.0+1.4.1",
+              "id": "libgit2-sys 0.13.1+1.4.2",
               "target": "libgit2_sys"
             },
             {
@@ -2516,7 +2520,7 @@
           "selects": {}
         },
         "edition": "2018",
-        "version": "0.14.0"
+        "version": "0.14.1"
       },
       "license": "MIT/Apache-2.0"
     },
@@ -3291,13 +3295,13 @@
       },
       "license": "MIT OR Apache-2.0"
     },
-    "libgit2-sys 0.13.0+1.4.1": {
+    "libgit2-sys 0.13.1+1.4.2": {
       "name": "libgit2-sys",
-      "version": "0.13.0+1.4.1",
+      "version": "0.13.1+1.4.2",
       "repository": {
         "Http": {
-          "url": "https://crates.io/api/v1/crates/libgit2-sys/0.13.0+1.4.1/download",
-          "sha256": "864e22fc06cae62860398cd854c93d5867f11c02ec916aa1417b440f170df23a"
+          "url": "https://crates.io/api/v1/crates/libgit2-sys/0.13.1+1.4.2/download",
+          "sha256": "43e598aa7a4faedf1ea1b4608f582b06f0f40211eec551b7ef36019ae3f62def"
         }
       },
       "targets": [
@@ -3336,7 +3340,7 @@
           "@libgit2"
         ],
         "edition": "2018",
-        "version": "0.13.0+1.4.1"
+        "version": "0.13.1+1.4.2"
       },
       "license": "MIT/Apache-2.0"
     },
@@ -5494,13 +5498,13 @@
       },
       "license": "ISC"
     },
-    "redox_syscall 0.2.10": {
+    "redox_syscall 0.2.11": {
       "name": "redox_syscall",
-      "version": "0.2.10",
+      "version": "0.2.11",
       "repository": {
         "Http": {
-          "url": "https://crates.io/api/v1/crates/redox_syscall/0.2.10/download",
-          "sha256": "8383f39639269cde97d255a32bdb68c047337295414940c68bdd30c2e13203ff"
+          "url": "https://crates.io/api/v1/crates/redox_syscall/0.2.11/download",
+          "sha256": "8380fe0152551244f0747b1bf41737e0f8a74f97a14ccefd1148187271634f3c"
         }
       },
       "targets": [
@@ -5532,7 +5536,7 @@
           "selects": {}
         },
         "edition": "2018",
-        "version": "0.2.10"
+        "version": "0.2.11"
       },
       "license": "MIT"
     },
@@ -6742,7 +6746,7 @@
             ],
             "cfg(target_os = \"redox\")": [
               {
-                "id": "redox_syscall 0.2.10",
+                "id": "redox_syscall 0.2.11",
                 "target": "syscall"
               }
             ],
@@ -7850,7 +7854,7 @@
         "deps": {
           "common": [
             {
-              "id": "clap 3.1.2",
+              "id": "clap 3.1.3",
               "target": "clap"
             },
             {
@@ -8340,6 +8344,9 @@
     "urls_generator 0.1.0": "tools/urls_generator"
   },
   "conditions": {
+    "aarch64-apple-darwin": [
+      "aarch64-apple-darwin"
+    ],
     "cfg(all(any(target_arch = \"x86_64\", target_arch = \"aarch64\"), target_os = \"hermit\"))": [],
     "cfg(all(target_arch = \"aarch64\", target_os = \"linux\"))": [
       "aarch64-unknown-linux-gnu"
@@ -8406,11 +8413,6 @@
       "x86_64-unknown-freebsd",
       "x86_64-unknown-linux-gnu"
     ],
-    "cfg(target = \"aarch64-apple-darwin\")": [
-      "aarch64-apple-darwin"
-    ],
-    "cfg(target = \"i686-pc-windows-gnu\")": [],
-    "cfg(target = \"x86_64-pc-windows-gnu\")": [],
     "cfg(target_arch = \"wasm32\")": [
       "wasm32-unknown-unknown",
       "wasm32-wasi"
@@ -8444,6 +8446,8 @@
     "cfg(windows)": [
       "i686-pc-windows-msvc",
       "x86_64-pc-windows-msvc"
-    ]
+    ],
+    "i686-pc-windows-gnu": [],
+    "x86_64-pc-windows-gnu": []
   }
 }
diff --git a/examples/cargo_aliases/Cargo.Bazel.lock b/examples/cargo_aliases/Cargo.Bazel.lock
index c671b215..b56d88fa 100644
--- a/examples/cargo_aliases/Cargo.Bazel.lock
+++ b/examples/cargo_aliases/Cargo.Bazel.lock
@@ -1,5 +1,5 @@
 {
-  "checksum": "537093748c79e672e8f8bcfc62e025a45f727c90b585d0b72f9c181bf9831f6d",
+  "checksum": "1e781aeb3bb3ed716032160e6d688c1e2e625c55ad54ecdd0442529001ea6944",
   "crates": {
     "aho-corasick 0.7.18": {
       "name": "aho-corasick",
@@ -2575,8 +2575,6 @@
     "aliases 0.1.0": "cargo_aliases"
   },
   "conditions": {
-    "cfg(target = \"i686-pc-windows-gnu\")": [],
-    "cfg(target = \"x86_64-pc-windows-gnu\")": [],
     "cfg(target_os = \"hermit\")": [],
     "cfg(target_os = \"wasi\")": [
       "wasm32-wasi"
@@ -2603,6 +2601,8 @@
     "cfg(windows)": [
       "i686-pc-windows-msvc",
       "x86_64-pc-windows-msvc"
-    ]
+    ],
+    "i686-pc-windows-gnu": [],
+    "x86_64-pc-windows-gnu": []
   }
 }
diff --git a/examples/cargo_workspace/Cargo.Bazel.lock b/examples/cargo_workspace/Cargo.Bazel.lock
index b37cdf02..e71e918c 100644
--- a/examples/cargo_workspace/Cargo.Bazel.lock
+++ b/examples/cargo_workspace/Cargo.Bazel.lock
@@ -1,5 +1,5 @@
 {
-  "checksum": "66c1f7ee24af927f771bde585522dc116b9ad43cd6db5355da4a662b12ec7834",
+  "checksum": "0116dced5bffc719d9e8c3a9fc34b13d9f97c61125722f5bcb4079df12465f56",
   "crates": {
     "ansi_term 0.12.1": {
       "name": "ansi_term",
@@ -1424,8 +1424,6 @@
       "x86_64-unknown-freebsd",
       "x86_64-unknown-linux-gnu"
     ],
-    "cfg(target = \"i686-pc-windows-gnu\")": [],
-    "cfg(target = \"x86_64-pc-windows-gnu\")": [],
     "cfg(target_os = \"emscripten\")": [],
     "cfg(target_os = \"hermit\")": [],
     "cfg(target_os = \"wasi\")": [
@@ -1457,6 +1455,8 @@
     "cfg(windows)": [
       "i686-pc-windows-msvc",
       "x86_64-pc-windows-msvc"
-    ]
+    ],
+    "i686-pc-windows-gnu": [],
+    "x86_64-pc-windows-gnu": []
   }
 }
diff --git a/examples/extra_workspace_members/Cargo.Bazel.lock b/examples/extra_workspace_members/Cargo.Bazel.lock
index 52dfcfc0..16ee3de8 100644
--- a/examples/extra_workspace_members/Cargo.Bazel.lock
+++ b/examples/extra_workspace_members/Cargo.Bazel.lock
@@ -1,5 +1,5 @@
 {
-  "checksum": "2ce185ce9b35f2aacdf547324b47cb834c6e789156adcaa7ce94765dc1ace50b",
+  "checksum": "88ae84c97c2e8c452718adf7be45f107fb90b070277b9941d1bce8add0d0434b",
   "crates": {
     "adler32 1.2.0": {
       "name": "adler32",
@@ -3239,8 +3239,6 @@
       "x86_64-unknown-freebsd",
       "x86_64-unknown-linux-gnu"
     ],
-    "cfg(target = \"i686-pc-windows-gnu\")": [],
-    "cfg(target = \"x86_64-pc-windows-gnu\")": [],
     "cfg(target_os = \"hermit\")": [],
     "cfg(target_os = \"windows\")": [
       "i686-pc-windows-msvc",
@@ -3268,6 +3266,8 @@
     "cfg(windows)": [
       "i686-pc-windows-msvc",
       "x86_64-pc-windows-msvc"
-    ]
+    ],
+    "i686-pc-windows-gnu": [],
+    "x86_64-pc-windows-gnu": []
   }
 }
diff --git a/examples/multi_package/Cargo.Bazel.lock b/examples/multi_package/Cargo.Bazel.lock
index c7b5bae3..dcaa69cf 100644
--- a/examples/multi_package/Cargo.Bazel.lock
+++ b/examples/multi_package/Cargo.Bazel.lock
@@ -1,5 +1,5 @@
 {
-  "checksum": "581db25f1480672ecd90cda8b77be0f1c895aae73dc6b87a0802dfb8b4a3388c",
+  "checksum": "b52e3679173a427dfe2c470a2bb505ac4a4221bcfa5f05e5e6f8978e9464f7f7",
   "crates": {
     "aho-corasick 0.7.18": {
       "name": "aho-corasick",
@@ -6215,7 +6215,7 @@
           "selects": {
             "cfg(target_os = \"redox\")": [
               {
-                "id": "redox_syscall 0.2.10",
+                "id": "redox_syscall 0.2.11",
                 "target": "syscall"
               }
             ],
@@ -6938,13 +6938,13 @@
       },
       "license": "MIT OR Apache-2.0"
     },
-    "redox_syscall 0.2.10": {
+    "redox_syscall 0.2.11": {
       "name": "redox_syscall",
-      "version": "0.2.10",
+      "version": "0.2.11",
       "repository": {
         "Http": {
-          "url": "https://crates.io/api/v1/crates/redox_syscall/0.2.10/download",
-          "sha256": "8383f39639269cde97d255a32bdb68c047337295414940c68bdd30c2e13203ff"
+          "url": "https://crates.io/api/v1/crates/redox_syscall/0.2.11/download",
+          "sha256": "8380fe0152551244f0747b1bf41737e0f8a74f97a14ccefd1148187271634f3c"
         }
       },
       "targets": [
@@ -6976,7 +6976,7 @@
           "selects": {}
         },
         "edition": "2018",
-        "version": "0.2.10"
+        "version": "0.2.11"
       },
       "license": "MIT"
     },
@@ -7015,7 +7015,7 @@
               "target": "getrandom"
             },
             {
-              "id": "redox_syscall 0.2.10",
+              "id": "redox_syscall 0.2.11",
               "target": "syscall"
             }
           ],
@@ -8516,7 +8516,7 @@
             ],
             "cfg(target_os = \"redox\")": [
               {
-                "id": "redox_syscall 0.2.10",
+                "id": "redox_syscall 0.2.11",
                 "target": "syscall"
               }
             ],
@@ -10737,8 +10737,6 @@
       "x86_64-unknown-freebsd",
       "x86_64-unknown-linux-gnu"
     ],
-    "cfg(target = \"i686-pc-windows-gnu\")": [],
-    "cfg(target = \"x86_64-pc-windows-gnu\")": [],
     "cfg(target_arch = \"wasm32\")": [
       "wasm32-unknown-unknown",
       "wasm32-wasi"
@@ -10779,6 +10777,8 @@
     "cfg(windows)": [
       "i686-pc-windows-msvc",
       "x86_64-pc-windows-msvc"
-    ]
+    ],
+    "i686-pc-windows-gnu": [],
+    "x86_64-pc-windows-gnu": []
   }
 }
diff --git a/examples/no_cargo_manifests/Cargo.Bazel.lock b/examples/no_cargo_manifests/Cargo.Bazel.lock
index 1bb19c60..82108b85 100644
--- a/examples/no_cargo_manifests/Cargo.Bazel.lock
+++ b/examples/no_cargo_manifests/Cargo.Bazel.lock
@@ -1,5 +1,5 @@
 {
-  "checksum": "59d195de7dd01ff3435fa0187b07b15e80387ff125fc294a426770d538a5dad9",
+  "checksum": "36b074c94b4d194e93d84a0fb8775ee42d34a4c3855ca11cd806d1d38c8a824a",
   "crates": {
     "ansi_term 0.12.1": {
       "name": "ansi_term",
@@ -149,13 +149,13 @@
       },
       "license": "Apache-2.0 OR MIT"
     },
-    "axum 0.4.6": {
+    "axum 0.4.7": {
       "name": "axum",
-      "version": "0.4.6",
+      "version": "0.4.7",
       "repository": {
         "Http": {
-          "url": "https://crates.io/api/v1/crates/axum/0.4.6/download",
-          "sha256": "157d3c6bef9a248ecf0492f05bb91019ced3c5b0f4cd9ec09b16d06596e1e743"
+          "url": "https://crates.io/api/v1/crates/axum/0.4.7/download",
+          "sha256": "fdfba8d55076d367807d4ada89bb689a3e2c0ce0e01bc977a61df03f9f705dcf"
         }
       },
       "targets": [
@@ -284,7 +284,7 @@
           ],
           "selects": {}
         },
-        "version": "0.4.6"
+        "version": "0.4.7"
       },
       "license": "MIT"
     },
@@ -487,7 +487,7 @@
         "deps": {
           "common": [
             {
-              "id": "axum 0.4.6",
+              "id": "axum 0.4.7",
               "target": "axum"
             },
             {
@@ -2335,7 +2335,7 @@
           "selects": {
             "cfg(target_os = \"redox\")": [
               {
-                "id": "redox_syscall 0.2.10",
+                "id": "redox_syscall 0.2.11",
                 "target": "syscall"
               }
             ],
@@ -2667,13 +2667,13 @@
       },
       "license": "MIT OR Apache-2.0"
     },
-    "redox_syscall 0.2.10": {
+    "redox_syscall 0.2.11": {
       "name": "redox_syscall",
-      "version": "0.2.10",
+      "version": "0.2.11",
       "repository": {
         "Http": {
-          "url": "https://crates.io/api/v1/crates/redox_syscall/0.2.10/download",
-          "sha256": "8383f39639269cde97d255a32bdb68c047337295414940c68bdd30c2e13203ff"
+          "url": "https://crates.io/api/v1/crates/redox_syscall/0.2.11/download",
+          "sha256": "8380fe0152551244f0747b1bf41737e0f8a74f97a14ccefd1148187271634f3c"
         }
       },
       "targets": [
@@ -2705,7 +2705,7 @@
           "selects": {}
         },
         "edition": "2018",
-        "version": "0.2.10"
+        "version": "0.2.11"
       },
       "license": "MIT"
     },
@@ -4607,8 +4607,6 @@
       "x86_64-unknown-freebsd",
       "x86_64-unknown-linux-gnu"
     ],
-    "cfg(target = \"i686-pc-windows-gnu\")": [],
-    "cfg(target = \"x86_64-pc-windows-gnu\")": [],
     "cfg(target_os = \"redox\")": [],
     "cfg(target_os = \"windows\")": [
       "i686-pc-windows-msvc",
@@ -4637,6 +4635,8 @@
     "cfg(windows)": [
       "i686-pc-windows-msvc",
       "x86_64-pc-windows-msvc"
-    ]
+    ],
+    "i686-pc-windows-gnu": [],
+    "x86_64-pc-windows-gnu": []
   }
 }
diff --git a/examples/vendor_local_manifests/crates/defs.bzl b/examples/vendor_local_manifests/crates/defs.bzl
index 4c9b97e1..99501585 100644
--- a/examples/vendor_local_manifests/crates/defs.bzl
+++ b/examples/vendor_local_manifests/crates/defs.bzl
@@ -359,10 +359,10 @@ _CONDITIONS = {
     "cfg(all(any(target_arch = \"x86_64\", target_arch = \"aarch64\"), target_os = \"hermit\"))": [],
     "cfg(any(unix, target_os = \"wasi\"))": ["aarch64-apple-darwin", "aarch64-apple-ios", "aarch64-linux-android", "aarch64-unknown-linux-gnu", "arm-unknown-linux-gnueabi", "armv7-unknown-linux-gnueabi", "i686-apple-darwin", "i686-linux-android", "i686-unknown-freebsd", "i686-unknown-linux-gnu", "powerpc-unknown-linux-gnu", "s390x-unknown-linux-gnu", "wasm32-wasi", "x86_64-apple-darwin", "x86_64-apple-ios", "x86_64-linux-android", "x86_64-unknown-freebsd", "x86_64-unknown-linux-gnu"],
     "cfg(not(windows))": ["aarch64-apple-darwin", "aarch64-apple-ios", "aarch64-linux-android", "aarch64-unknown-linux-gnu", "arm-unknown-linux-gnueabi", "armv7-unknown-linux-gnueabi", "i686-apple-darwin", "i686-linux-android", "i686-unknown-freebsd", "i686-unknown-linux-gnu", "powerpc-unknown-linux-gnu", "s390x-unknown-linux-gnu", "wasm32-unknown-unknown", "wasm32-wasi", "x86_64-apple-darwin", "x86_64-apple-ios", "x86_64-linux-android", "x86_64-unknown-freebsd", "x86_64-unknown-linux-gnu"],
-    "cfg(target = \"i686-pc-windows-gnu\")": [],
-    "cfg(target = \"x86_64-pc-windows-gnu\")": [],
     "cfg(target_arch = \"wasm32\")": ["wasm32-unknown-unknown", "wasm32-wasi"],
     "cfg(target_os = \"redox\")": [],
     "cfg(unix)": ["aarch64-apple-darwin", "aarch64-apple-ios", "aarch64-linux-android", "aarch64-unknown-linux-gnu", "arm-unknown-linux-gnueabi", "armv7-unknown-linux-gnueabi", "i686-apple-darwin", "i686-linux-android", "i686-unknown-freebsd", "i686-unknown-linux-gnu", "powerpc-unknown-linux-gnu", "s390x-unknown-linux-gnu", "x86_64-apple-darwin", "x86_64-apple-ios", "x86_64-linux-android", "x86_64-unknown-freebsd", "x86_64-unknown-linux-gnu"],
     "cfg(windows)": ["i686-pc-windows-msvc", "x86_64-pc-windows-msvc"],
+    "i686-pc-windows-gnu": [],
+    "x86_64-pc-windows-gnu": [],
 }
diff --git a/examples/vendor_local_manifests/crates/parking_lot_core-0.8.5/BUILD.bazel b/examples/vendor_local_manifests/crates/parking_lot_core-0.8.5/BUILD.bazel
index 913e4347..fd66545a 100644
--- a/examples/vendor_local_manifests/crates/parking_lot_core-0.8.5/BUILD.bazel
+++ b/examples/vendor_local_manifests/crates/parking_lot_core-0.8.5/BUILD.bazel
@@ -85,7 +85,7 @@ rust_library(
         # cfg(target_os = "redox")
         #
         # No supported platform triples for cfg: 'cfg(target_os = "redox")'
-        # Skipped dependencies: [{"id":"redox_syscall 0.2.10","target":"syscall"}]
+        # Skipped dependencies: [{"id":"redox_syscall 0.2.11","target":"syscall"}]
         #
         # cfg(unix)
         (
diff --git a/examples/vendor_local_manifests/crates/redox_syscall-0.2.10/BUILD.bazel b/examples/vendor_local_manifests/crates/redox_syscall-0.2.11/BUILD.bazel
similarity index 98%
rename from examples/vendor_local_manifests/crates/redox_syscall-0.2.10/BUILD.bazel
rename to examples/vendor_local_manifests/crates/redox_syscall-0.2.11/BUILD.bazel
index b2db00fc..64afa1f3 100644
--- a/examples/vendor_local_manifests/crates/redox_syscall-0.2.10/BUILD.bazel
+++ b/examples/vendor_local_manifests/crates/redox_syscall-0.2.11/BUILD.bazel
@@ -75,7 +75,7 @@ rust_library(
         "noclippy",
         "norustfmt",
     ],
-    version = "0.2.10",
+    version = "0.2.11",
     deps = [
     ] + select_with_or({
         "//conditions:default": [
diff --git a/examples/vendor_local_manifests/crates/tempfile-3.3.0/BUILD.bazel b/examples/vendor_local_manifests/crates/tempfile-3.3.0/BUILD.bazel
index 9ae3bc6b..5c6b37a0 100644
--- a/examples/vendor_local_manifests/crates/tempfile-3.3.0/BUILD.bazel
+++ b/examples/vendor_local_manifests/crates/tempfile-3.3.0/BUILD.bazel
@@ -110,7 +110,7 @@ rust_library(
         # cfg(target_os = "redox")
         #
         # No supported platform triples for cfg: 'cfg(target_os = "redox")'
-        # Skipped dependencies: [{"id":"redox_syscall 0.2.10","target":"syscall"}]
+        # Skipped dependencies: [{"id":"redox_syscall 0.2.11","target":"syscall"}]
         #
         # cfg(windows)
         (
diff --git a/examples/vendor_local_pkgs/crates/BUILD.bazel b/examples/vendor_local_pkgs/crates/BUILD.bazel
index 565b1156..d88865b7 100644
--- a/examples/vendor_local_pkgs/crates/BUILD.bazel
+++ b/examples/vendor_local_pkgs/crates/BUILD.bazel
@@ -27,7 +27,7 @@ filegroup(
 # Workspace Member Dependencies
 alias(
     name = "axum",
-    actual = "//vendor_local_pkgs/crates/axum-0.4.6:axum",
+    actual = "//vendor_local_pkgs/crates/axum-0.4.7:axum",
     tags = ["manual"],
 )
 
diff --git a/examples/vendor_local_pkgs/crates/axum-0.4.6/BUILD.bazel b/examples/vendor_local_pkgs/crates/axum-0.4.7/BUILD.bazel
similarity index 99%
rename from examples/vendor_local_pkgs/crates/axum-0.4.6/BUILD.bazel
rename to examples/vendor_local_pkgs/crates/axum-0.4.7/BUILD.bazel
index 629e903e..9f357195 100644
--- a/examples/vendor_local_pkgs/crates/axum-0.4.6/BUILD.bazel
+++ b/examples/vendor_local_pkgs/crates/axum-0.4.7/BUILD.bazel
@@ -84,7 +84,7 @@ rust_library(
         "noclippy",
         "norustfmt",
     ],
-    version = "0.4.6",
+    version = "0.4.7",
     deps = [
     ] + select_with_or({
         "//conditions:default": [
diff --git a/examples/vendor_local_pkgs/crates/defs.bzl b/examples/vendor_local_pkgs/crates/defs.bzl
index 902c7067..c666b93f 100644
--- a/examples/vendor_local_pkgs/crates/defs.bzl
+++ b/examples/vendor_local_pkgs/crates/defs.bzl
@@ -285,7 +285,7 @@ def aliases(
 _NORMAL_DEPENDENCIES = {
     "": {
         _COMMON_CONDITION: {
-            "axum": "//vendor_local_pkgs/crates/axum-0.4.6:axum",
+            "axum": "//vendor_local_pkgs/crates/axum-0.4.7:axum",
             "hyper": "//vendor_local_pkgs/crates/hyper-0.14.17:hyper",
             "mime": "//vendor_local_pkgs/crates/mime-0.3.16:mime",
             "serde_json": "//vendor_local_pkgs/crates/serde_json-1.0.79:serde_json",
@@ -358,11 +358,11 @@ _BUILD_PROC_MACRO_ALIASES = {
 _CONDITIONS = {
     "cfg(all(any(target_arch = \"x86_64\", target_arch = \"aarch64\"), target_os = \"hermit\"))": [],
     "cfg(not(windows))": ["aarch64-apple-darwin", "aarch64-apple-ios", "aarch64-linux-android", "aarch64-unknown-linux-gnu", "arm-unknown-linux-gnueabi", "armv7-unknown-linux-gnueabi", "i686-apple-darwin", "i686-linux-android", "i686-unknown-freebsd", "i686-unknown-linux-gnu", "powerpc-unknown-linux-gnu", "s390x-unknown-linux-gnu", "wasm32-unknown-unknown", "wasm32-wasi", "x86_64-apple-darwin", "x86_64-apple-ios", "x86_64-linux-android", "x86_64-unknown-freebsd", "x86_64-unknown-linux-gnu"],
-    "cfg(target = \"i686-pc-windows-gnu\")": [],
-    "cfg(target = \"x86_64-pc-windows-gnu\")": [],
     "cfg(target_os = \"redox\")": [],
     "cfg(target_os = \"windows\")": ["i686-pc-windows-msvc", "x86_64-pc-windows-msvc"],
     "cfg(tracing_unstable)": [],
     "cfg(unix)": ["aarch64-apple-darwin", "aarch64-apple-ios", "aarch64-linux-android", "aarch64-unknown-linux-gnu", "arm-unknown-linux-gnueabi", "armv7-unknown-linux-gnueabi", "i686-apple-darwin", "i686-linux-android", "i686-unknown-freebsd", "i686-unknown-linux-gnu", "powerpc-unknown-linux-gnu", "s390x-unknown-linux-gnu", "x86_64-apple-darwin", "x86_64-apple-ios", "x86_64-linux-android", "x86_64-unknown-freebsd", "x86_64-unknown-linux-gnu"],
     "cfg(windows)": ["i686-pc-windows-msvc", "x86_64-pc-windows-msvc"],
+    "i686-pc-windows-gnu": [],
+    "x86_64-pc-windows-gnu": [],
 }
diff --git a/examples/vendor_local_pkgs/crates/parking_lot_core-0.8.5/BUILD.bazel b/examples/vendor_local_pkgs/crates/parking_lot_core-0.8.5/BUILD.bazel
index 80e0f8b4..bc0d6cb0 100644
--- a/examples/vendor_local_pkgs/crates/parking_lot_core-0.8.5/BUILD.bazel
+++ b/examples/vendor_local_pkgs/crates/parking_lot_core-0.8.5/BUILD.bazel
@@ -85,7 +85,7 @@ rust_library(
         # cfg(target_os = "redox")
         #
         # No supported platform triples for cfg: 'cfg(target_os = "redox")'
-        # Skipped dependencies: [{"id":"redox_syscall 0.2.10","target":"syscall"}]
+        # Skipped dependencies: [{"id":"redox_syscall 0.2.11","target":"syscall"}]
         #
         # cfg(unix)
         (
diff --git a/examples/vendor_local_pkgs/crates/redox_syscall-0.2.10/BUILD.bazel b/examples/vendor_local_pkgs/crates/redox_syscall-0.2.11/BUILD.bazel
similarity index 98%
rename from examples/vendor_local_pkgs/crates/redox_syscall-0.2.10/BUILD.bazel
rename to examples/vendor_local_pkgs/crates/redox_syscall-0.2.11/BUILD.bazel
index 2c826674..c68cac5f 100644
--- a/examples/vendor_local_pkgs/crates/redox_syscall-0.2.10/BUILD.bazel
+++ b/examples/vendor_local_pkgs/crates/redox_syscall-0.2.11/BUILD.bazel
@@ -75,7 +75,7 @@ rust_library(
         "noclippy",
         "norustfmt",
     ],
-    version = "0.2.10",
+    version = "0.2.11",
     deps = [
     ] + select_with_or({
         "//conditions:default": [
diff --git a/examples/vendor_remote_manifests/crates/BUILD.parking_lot_core-0.8.5.bazel b/examples/vendor_remote_manifests/crates/BUILD.parking_lot_core-0.8.5.bazel
index 6861ae4d..adff06e2 100644
--- a/examples/vendor_remote_manifests/crates/BUILD.parking_lot_core-0.8.5.bazel
+++ b/examples/vendor_remote_manifests/crates/BUILD.parking_lot_core-0.8.5.bazel
@@ -85,7 +85,7 @@ rust_library(
         # cfg(target_os = "redox")
         #
         # No supported platform triples for cfg: 'cfg(target_os = "redox")'
-        # Skipped dependencies: [{"id":"redox_syscall 0.2.10","target":"syscall"}]
+        # Skipped dependencies: [{"id":"redox_syscall 0.2.11","target":"syscall"}]
         #
         # cfg(unix)
         (
diff --git a/examples/vendor_remote_manifests/crates/BUILD.redox_syscall-0.2.10.bazel b/examples/vendor_remote_manifests/crates/BUILD.redox_syscall-0.2.11.bazel
similarity index 98%
rename from examples/vendor_remote_manifests/crates/BUILD.redox_syscall-0.2.10.bazel
rename to examples/vendor_remote_manifests/crates/BUILD.redox_syscall-0.2.11.bazel
index f5b2e868..4a56680b 100644
--- a/examples/vendor_remote_manifests/crates/BUILD.redox_syscall-0.2.10.bazel
+++ b/examples/vendor_remote_manifests/crates/BUILD.redox_syscall-0.2.11.bazel
@@ -75,7 +75,7 @@ rust_library(
         "noclippy",
         "norustfmt",
     ],
-    version = "0.2.10",
+    version = "0.2.11",
     deps = [
     ] + select_with_or({
         "//conditions:default": [
diff --git a/examples/vendor_remote_manifests/crates/BUILD.tempfile-3.3.0.bazel b/examples/vendor_remote_manifests/crates/BUILD.tempfile-3.3.0.bazel
index 314b08d0..bbef89cb 100644
--- a/examples/vendor_remote_manifests/crates/BUILD.tempfile-3.3.0.bazel
+++ b/examples/vendor_remote_manifests/crates/BUILD.tempfile-3.3.0.bazel
@@ -110,7 +110,7 @@ rust_library(
         # cfg(target_os = "redox")
         #
         # No supported platform triples for cfg: 'cfg(target_os = "redox")'
-        # Skipped dependencies: [{"id":"redox_syscall 0.2.10","target":"syscall"}]
+        # Skipped dependencies: [{"id":"redox_syscall 0.2.11","target":"syscall"}]
         #
         # cfg(windows)
         (
diff --git a/examples/vendor_remote_manifests/crates/defs.bzl b/examples/vendor_remote_manifests/crates/defs.bzl
index 53ca6e43..d8d9bec3 100644
--- a/examples/vendor_remote_manifests/crates/defs.bzl
+++ b/examples/vendor_remote_manifests/crates/defs.bzl
@@ -361,12 +361,12 @@ _CONDITIONS = {
     "cfg(all(any(target_arch = \"x86_64\", target_arch = \"aarch64\"), target_os = \"hermit\"))": [],
     "cfg(any(unix, target_os = \"wasi\"))": ["aarch64-apple-darwin", "aarch64-apple-ios", "aarch64-linux-android", "aarch64-unknown-linux-gnu", "arm-unknown-linux-gnueabi", "armv7-unknown-linux-gnueabi", "i686-apple-darwin", "i686-linux-android", "i686-unknown-freebsd", "i686-unknown-linux-gnu", "powerpc-unknown-linux-gnu", "s390x-unknown-linux-gnu", "wasm32-wasi", "x86_64-apple-darwin", "x86_64-apple-ios", "x86_64-linux-android", "x86_64-unknown-freebsd", "x86_64-unknown-linux-gnu"],
     "cfg(not(windows))": ["aarch64-apple-darwin", "aarch64-apple-ios", "aarch64-linux-android", "aarch64-unknown-linux-gnu", "arm-unknown-linux-gnueabi", "armv7-unknown-linux-gnueabi", "i686-apple-darwin", "i686-linux-android", "i686-unknown-freebsd", "i686-unknown-linux-gnu", "powerpc-unknown-linux-gnu", "s390x-unknown-linux-gnu", "wasm32-unknown-unknown", "wasm32-wasi", "x86_64-apple-darwin", "x86_64-apple-ios", "x86_64-linux-android", "x86_64-unknown-freebsd", "x86_64-unknown-linux-gnu"],
-    "cfg(target = \"i686-pc-windows-gnu\")": [],
-    "cfg(target = \"x86_64-pc-windows-gnu\")": [],
     "cfg(target_arch = \"wasm32\")": ["wasm32-unknown-unknown", "wasm32-wasi"],
     "cfg(target_os = \"redox\")": [],
     "cfg(unix)": ["aarch64-apple-darwin", "aarch64-apple-ios", "aarch64-linux-android", "aarch64-unknown-linux-gnu", "arm-unknown-linux-gnueabi", "armv7-unknown-linux-gnueabi", "i686-apple-darwin", "i686-linux-android", "i686-unknown-freebsd", "i686-unknown-linux-gnu", "powerpc-unknown-linux-gnu", "s390x-unknown-linux-gnu", "x86_64-apple-darwin", "x86_64-apple-ios", "x86_64-linux-android", "x86_64-unknown-freebsd", "x86_64-unknown-linux-gnu"],
     "cfg(windows)": ["i686-pc-windows-msvc", "x86_64-pc-windows-msvc"],
+    "i686-pc-windows-gnu": [],
+    "x86_64-pc-windows-gnu": [],
 }
 
 ###############################################################################
@@ -605,12 +605,12 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "crates_vendor_manifests__redox_syscall-0.2.10",
-        sha256 = "8383f39639269cde97d255a32bdb68c047337295414940c68bdd30c2e13203ff",
+        name = "crates_vendor_manifests__redox_syscall-0.2.11",
+        sha256 = "8380fe0152551244f0747b1bf41737e0f8a74f97a14ccefd1148187271634f3c",
         type = "tar.gz",
-        urls = ["https://crates.io/api/v1/crates/redox_syscall/0.2.10/download"],
-        strip_prefix = "redox_syscall-0.2.10",
-        build_file = Label("@examples//vendor_remote_manifests/crates:BUILD.redox_syscall-0.2.10.bazel"),
+        urls = ["https://crates.io/api/v1/crates/redox_syscall/0.2.11/download"],
+        strip_prefix = "redox_syscall-0.2.11",
+        build_file = Label("@examples//vendor_remote_manifests/crates:BUILD.redox_syscall-0.2.11.bazel"),
     )
 
     maybe(
diff --git a/examples/vendor_remote_pkgs/crates/BUILD.axum-0.4.6.bazel b/examples/vendor_remote_pkgs/crates/BUILD.axum-0.4.7.bazel
similarity index 99%
rename from examples/vendor_remote_pkgs/crates/BUILD.axum-0.4.6.bazel
rename to examples/vendor_remote_pkgs/crates/BUILD.axum-0.4.7.bazel
index 7bed79c1..0eca220e 100644
--- a/examples/vendor_remote_pkgs/crates/BUILD.axum-0.4.6.bazel
+++ b/examples/vendor_remote_pkgs/crates/BUILD.axum-0.4.7.bazel
@@ -84,7 +84,7 @@ rust_library(
         "noclippy",
         "norustfmt",
     ],
-    version = "0.4.6",
+    version = "0.4.7",
     deps = [
     ] + select_with_or({
         "//conditions:default": [
diff --git a/examples/vendor_remote_pkgs/crates/BUILD.bazel b/examples/vendor_remote_pkgs/crates/BUILD.bazel
index 2a80758e..36489e5d 100644
--- a/examples/vendor_remote_pkgs/crates/BUILD.bazel
+++ b/examples/vendor_remote_pkgs/crates/BUILD.bazel
@@ -28,7 +28,7 @@ filegroup(
 # Workspace Member Dependencies
 alias(
     name = "axum",
-    actual = "@crates_vendor_pkgs__axum-0.4.6//:axum",
+    actual = "@crates_vendor_pkgs__axum-0.4.7//:axum",
     tags = ["manual"],
 )
 
diff --git a/examples/vendor_remote_pkgs/crates/BUILD.parking_lot_core-0.8.5.bazel b/examples/vendor_remote_pkgs/crates/BUILD.parking_lot_core-0.8.5.bazel
index 5ed8c50e..412559cd 100644
--- a/examples/vendor_remote_pkgs/crates/BUILD.parking_lot_core-0.8.5.bazel
+++ b/examples/vendor_remote_pkgs/crates/BUILD.parking_lot_core-0.8.5.bazel
@@ -85,7 +85,7 @@ rust_library(
         # cfg(target_os = "redox")
         #
         # No supported platform triples for cfg: 'cfg(target_os = "redox")'
-        # Skipped dependencies: [{"id":"redox_syscall 0.2.10","target":"syscall"}]
+        # Skipped dependencies: [{"id":"redox_syscall 0.2.11","target":"syscall"}]
         #
         # cfg(unix)
         (
diff --git a/examples/vendor_remote_pkgs/crates/BUILD.redox_syscall-0.2.10.bazel b/examples/vendor_remote_pkgs/crates/BUILD.redox_syscall-0.2.11.bazel
similarity index 98%
rename from examples/vendor_remote_pkgs/crates/BUILD.redox_syscall-0.2.10.bazel
rename to examples/vendor_remote_pkgs/crates/BUILD.redox_syscall-0.2.11.bazel
index 48fbb16f..95b8aa9e 100644
--- a/examples/vendor_remote_pkgs/crates/BUILD.redox_syscall-0.2.10.bazel
+++ b/examples/vendor_remote_pkgs/crates/BUILD.redox_syscall-0.2.11.bazel
@@ -75,7 +75,7 @@ rust_library(
         "noclippy",
         "norustfmt",
     ],
-    version = "0.2.10",
+    version = "0.2.11",
     deps = [
     ] + select_with_or({
         "//conditions:default": [
diff --git a/examples/vendor_remote_pkgs/crates/defs.bzl b/examples/vendor_remote_pkgs/crates/defs.bzl
index c0666455..00736f05 100644
--- a/examples/vendor_remote_pkgs/crates/defs.bzl
+++ b/examples/vendor_remote_pkgs/crates/defs.bzl
@@ -287,7 +287,7 @@ def aliases(
 _NORMAL_DEPENDENCIES = {
     "": {
         _COMMON_CONDITION: {
-            "axum": "@crates_vendor_pkgs__axum-0.4.6//:axum",
+            "axum": "@crates_vendor_pkgs__axum-0.4.7//:axum",
             "hyper": "@crates_vendor_pkgs__hyper-0.14.17//:hyper",
             "mime": "@crates_vendor_pkgs__mime-0.3.16//:mime",
             "serde_json": "@crates_vendor_pkgs__serde_json-1.0.79//:serde_json",
@@ -360,13 +360,13 @@ _BUILD_PROC_MACRO_ALIASES = {
 _CONDITIONS = {
     "cfg(all(any(target_arch = \"x86_64\", target_arch = \"aarch64\"), target_os = \"hermit\"))": [],
     "cfg(not(windows))": ["aarch64-apple-darwin", "aarch64-apple-ios", "aarch64-linux-android", "aarch64-unknown-linux-gnu", "arm-unknown-linux-gnueabi", "armv7-unknown-linux-gnueabi", "i686-apple-darwin", "i686-linux-android", "i686-unknown-freebsd", "i686-unknown-linux-gnu", "powerpc-unknown-linux-gnu", "s390x-unknown-linux-gnu", "wasm32-unknown-unknown", "wasm32-wasi", "x86_64-apple-darwin", "x86_64-apple-ios", "x86_64-linux-android", "x86_64-unknown-freebsd", "x86_64-unknown-linux-gnu"],
-    "cfg(target = \"i686-pc-windows-gnu\")": [],
-    "cfg(target = \"x86_64-pc-windows-gnu\")": [],
     "cfg(target_os = \"redox\")": [],
     "cfg(target_os = \"windows\")": ["i686-pc-windows-msvc", "x86_64-pc-windows-msvc"],
     "cfg(tracing_unstable)": [],
     "cfg(unix)": ["aarch64-apple-darwin", "aarch64-apple-ios", "aarch64-linux-android", "aarch64-unknown-linux-gnu", "arm-unknown-linux-gnueabi", "armv7-unknown-linux-gnueabi", "i686-apple-darwin", "i686-linux-android", "i686-unknown-freebsd", "i686-unknown-linux-gnu", "powerpc-unknown-linux-gnu", "s390x-unknown-linux-gnu", "x86_64-apple-darwin", "x86_64-apple-ios", "x86_64-linux-android", "x86_64-unknown-freebsd", "x86_64-unknown-linux-gnu"],
     "cfg(windows)": ["i686-pc-windows-msvc", "x86_64-pc-windows-msvc"],
+    "i686-pc-windows-gnu": [],
+    "x86_64-pc-windows-gnu": [],
 }
 
 ###############################################################################
@@ -405,12 +405,12 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "crates_vendor_pkgs__axum-0.4.6",
-        sha256 = "157d3c6bef9a248ecf0492f05bb91019ced3c5b0f4cd9ec09b16d06596e1e743",
+        name = "crates_vendor_pkgs__axum-0.4.7",
+        sha256 = "fdfba8d55076d367807d4ada89bb689a3e2c0ce0e01bc977a61df03f9f705dcf",
         type = "tar.gz",
-        urls = ["https://crates.io/api/v1/crates/axum/0.4.6/download"],
-        strip_prefix = "axum-0.4.6",
-        build_file = Label("@examples//vendor_remote_pkgs/crates:BUILD.axum-0.4.6.bazel"),
+        urls = ["https://crates.io/api/v1/crates/axum/0.4.7/download"],
+        strip_prefix = "axum-0.4.7",
+        build_file = Label("@examples//vendor_remote_pkgs/crates:BUILD.axum-0.4.7.bazel"),
     )
 
     maybe(
@@ -865,12 +865,12 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "crates_vendor_pkgs__redox_syscall-0.2.10",
-        sha256 = "8383f39639269cde97d255a32bdb68c047337295414940c68bdd30c2e13203ff",
+        name = "crates_vendor_pkgs__redox_syscall-0.2.11",
+        sha256 = "8380fe0152551244f0747b1bf41737e0f8a74f97a14ccefd1148187271634f3c",
         type = "tar.gz",
-        urls = ["https://crates.io/api/v1/crates/redox_syscall/0.2.10/download"],
-        strip_prefix = "redox_syscall-0.2.10",
-        build_file = Label("@examples//vendor_remote_pkgs/crates:BUILD.redox_syscall-0.2.10.bazel"),
+        urls = ["https://crates.io/api/v1/crates/redox_syscall/0.2.11/download"],
+        strip_prefix = "redox_syscall-0.2.11",
+        build_file = Label("@examples//vendor_remote_pkgs/crates:BUILD.redox_syscall-0.2.11.bazel"),
     )
 
     maybe(
diff --git a/src/context/platforms.rs b/src/context/platforms.rs
index 03d47cb5..724dbd01 100644
--- a/src/context/platforms.rs
+++ b/src/context/platforms.rs
@@ -1,4 +1,4 @@
-use std::collections::{BTreeMap, BTreeSet};
+use std::collections::{BTreeMap, BTreeSet, HashMap};
 
 use anyhow::{anyhow, Context, Result};
 use cfg_expr::targets::{get_builtin_target_by_triple, TargetInfo};
@@ -7,6 +7,8 @@ use cfg_expr::{Expression, Predicate};
 use crate::context::CrateContext;
 use crate::utils::starlark::Select;
 
+/// Walk through all dependencies in a [CrateContext] list for all configuration specific
+/// dependencies to produce a mapping of configuration to compatible platform triples.
 pub fn resolve_cfg_platforms(
     crates: Vec<&CrateContext>,
     supported_platform_triples: &BTreeSet<String>,
@@ -50,13 +52,24 @@ pub fn resolve_cfg_platforms(
         })
         .collect::<Result<Vec<&'static TargetInfo>>>()?;
 
+    // `cfg-expr` does not understand configurations that are simply platform triples
+    // (`x86_64-unknown-linux-gun` vs `cfg(target = "x86_64-unkonwn-linux-gnu")`). So
+    // in order to parse configurations, the text is renamed for the check but the
+    // original is retained for comaptibility with the manifest.
+    let rename = |cfg: &str| -> String { format!("cfg(target = \"{}\")", cfg) };
+    let original_cfgs: HashMap<String, String> = configurations
+        .iter()
+        .filter(|cfg| !cfg.starts_with("cfg("))
+        .map(|cfg| (rename(cfg), cfg.clone()))
+        .collect();
+
     configurations
         .into_iter()
         // `cfg-expr` requires that the expressions be actual `cfg` expressions. Any time
         // there's a target triple (which is a valid constraint), convert it to a cfg expression.
         .map(|cfg| match cfg.starts_with("cfg(") {
             true => cfg.to_string(),
-            false => format!("cfg(target = \"{}\")", cfg),
+            false => rename(&cfg),
         })
         // Check the current configuration with against each supported triple
         .map(|cfg| {
@@ -78,7 +91,179 @@ pub fn resolve_cfg_platforms(
                 .map(|info| info.triple.to_string())
                 .collect();
 
+            // Map any renamed configurations back to their original IDs
+            let cfg = match original_cfgs.get(&cfg) {
+                Some(orig) => orig.clone(),
+                None => cfg,
+            };
+
             Ok((cfg, triples))
         })
         .collect()
 }
+
+#[cfg(test)]
+mod test {
+    use crate::config::CrateId;
+    use crate::context::crate_context::CrateDependency;
+    use crate::context::CommonAttributes;
+    use crate::utils::starlark::SelectList;
+
+    use super::*;
+
+    fn supported_platform_triples() -> BTreeSet<String> {
+        BTreeSet::from([
+            "aarch64-apple-darwin".to_owned(),
+            "aarch64-apple-ios".to_owned(),
+            "aarch64-linux-android".to_owned(),
+            "aarch64-unknown-linux-gnu".to_owned(),
+            "arm-unknown-linux-gnueabi".to_owned(),
+            "armv7-unknown-linux-gnueabi".to_owned(),
+            "i686-apple-darwin".to_owned(),
+            "i686-linux-android".to_owned(),
+            "i686-pc-windows-msvc".to_owned(),
+            "i686-unknown-freebsd".to_owned(),
+            "i686-unknown-linux-gnu".to_owned(),
+            "powerpc-unknown-linux-gnu".to_owned(),
+            "s390x-unknown-linux-gnu".to_owned(),
+            "wasm32-unknown-unknown".to_owned(),
+            "wasm32-wasi".to_owned(),
+            "x86_64-apple-darwin".to_owned(),
+            "x86_64-apple-ios".to_owned(),
+            "x86_64-linux-android".to_owned(),
+            "x86_64-pc-windows-msvc".to_owned(),
+            "x86_64-unknown-freebsd".to_owned(),
+            "x86_64-unknown-linux-gnu".to_owned(),
+        ])
+    }
+
+    #[test]
+    fn resolve_no_targeted() {
+        let mut deps = SelectList::default();
+        deps.insert(
+            CrateDependency {
+                id: CrateId::new("mock_crate_b".to_owned(), "0.1.0".to_owned()),
+                target: "mock_crate_b".to_owned(),
+                alias: None,
+            },
+            None,
+        );
+
+        let context = CrateContext {
+            name: "mock_crate_a".to_owned(),
+            version: "0.1.0".to_owned(),
+            common_attrs: CommonAttributes {
+                deps,
+                ..CommonAttributes::default()
+            },
+            ..CrateContext::default()
+        };
+
+        let configurations =
+            resolve_cfg_platforms(vec![&context], &supported_platform_triples()).unwrap();
+
+        assert_eq!(configurations, BTreeMap::new(),)
+    }
+
+    #[test]
+    fn resolve_targeted() {
+        let configuration = r#"cfg(target = "x86_64-unknown-linux-gnu")"#.to_owned();
+        let mut deps = SelectList::default();
+        deps.insert(
+            CrateDependency {
+                id: CrateId::new("mock_crate_b".to_owned(), "0.1.0".to_owned()),
+                target: "mock_crate_b".to_owned(),
+                alias: None,
+            },
+            Some(configuration.clone()),
+        );
+
+        let context = CrateContext {
+            name: "mock_crate_a".to_owned(),
+            version: "0.1.0".to_owned(),
+            common_attrs: CommonAttributes {
+                deps,
+                ..CommonAttributes::default()
+            },
+            ..CrateContext::default()
+        };
+
+        let configurations =
+            resolve_cfg_platforms(vec![&context], &supported_platform_triples()).unwrap();
+
+        assert_eq!(
+            configurations,
+            BTreeMap::from([(
+                configuration,
+                BTreeSet::from(["x86_64-unknown-linux-gnu".to_owned()])
+            )])
+        );
+    }
+
+    #[test]
+    fn resolve_platforms() {
+        let configuration = r#"x86_64-unknown-linux-gnu"#.to_owned();
+        let mut deps = SelectList::default();
+        deps.insert(
+            CrateDependency {
+                id: CrateId::new("mock_crate_b".to_owned(), "0.1.0".to_owned()),
+                target: "mock_crate_b".to_owned(),
+                alias: None,
+            },
+            Some(configuration.clone()),
+        );
+
+        let context = CrateContext {
+            name: "mock_crate_a".to_owned(),
+            version: "0.1.0".to_owned(),
+            common_attrs: CommonAttributes {
+                deps,
+                ..CommonAttributes::default()
+            },
+            ..CrateContext::default()
+        };
+
+        let configurations =
+            resolve_cfg_platforms(vec![&context], &supported_platform_triples()).unwrap();
+
+        assert_eq!(
+            configurations,
+            BTreeMap::from([(
+                configuration,
+                BTreeSet::from(["x86_64-unknown-linux-gnu".to_owned()])
+            )])
+        );
+    }
+
+    #[test]
+    fn resolve_unsupported_targeted() {
+        let configuration = r#"cfg(target = "x86_64-unknown-unknown")"#.to_owned();
+        let mut deps = SelectList::default();
+        deps.insert(
+            CrateDependency {
+                id: CrateId::new("mock_crate_b".to_owned(), "0.1.0".to_owned()),
+                target: "mock_crate_b".to_owned(),
+                alias: None,
+            },
+            Some(configuration.clone()),
+        );
+
+        let context = CrateContext {
+            name: "mock_crate_a".to_owned(),
+            version: "0.1.0".to_owned(),
+            common_attrs: CommonAttributes {
+                deps,
+                ..CommonAttributes::default()
+            },
+            ..CrateContext::default()
+        };
+
+        let configurations =
+            resolve_cfg_platforms(vec![&context], &supported_platform_triples()).unwrap();
+
+        assert_eq!(
+            configurations,
+            BTreeMap::from([(configuration, BTreeSet::new())])
+        );
+    }
+}