diff --git a/doc/api.md b/doc/api.md
index 83cc29292..756be148a 100644
--- a/doc/api.md
+++ b/doc/api.md
@@ -303,7 +303,7 @@ Extracts the symbol graph from a Swift module.
 ## swift_common.get_toolchain
 
 <pre>
-swift_common.get_toolchain(<a href="#swift_common.get_toolchain-ctx">ctx</a>, <a href="#swift_common.get_toolchain-exec_group">exec_group</a>, <a href="#swift_common.get_toolchain-attr">attr</a>)
+swift_common.get_toolchain(<a href="#swift_common.get_toolchain-ctx">ctx</a>, <a href="#swift_common.get_toolchain-exec_group">exec_group</a>, <a href="#swift_common.get_toolchain-mandatory">mandatory</a>, <a href="#swift_common.get_toolchain-attr">attr</a>)
 </pre>
 
 Gets the Swift toolchain associated with the rule or aspect.
@@ -315,11 +315,13 @@ Gets the Swift toolchain associated with the rule or aspect.
 | :------------- | :------------- | :------------- |
 | <a id="swift_common.get_toolchain-ctx"></a>ctx |  The rule or aspect context.   |  none |
 | <a id="swift_common.get_toolchain-exec_group"></a>exec_group |  The name of the execution group that should contain the toolchain. If this is provided and the toolchain is not declared in that execution group, it will be looked up from `ctx` as a fallback instead. If this argument is `None` (the default), then the toolchain will only be looked up from `ctx.`   |  `None` |
+| <a id="swift_common.get_toolchain-mandatory"></a>mandatory |  If `False`, this function will return `None` instead of failing if no toolchain is found. Defaults to `True`.   |  `True` |
 | <a id="swift_common.get_toolchain-attr"></a>attr |  The name of the attribute on the calling rule or aspect that should be used to retrieve the toolchain if it is not provided by the `toolchains` argument of the rule/aspect. Note that this is only supported for legacy/migration purposes and will be removed once migration to toolchains is complete.   |  `"_toolchain"` |
 
 **RETURNS**
 
-A `SwiftToolchainInfo` provider.
+A `SwiftToolchainInfo` provider, or `None` if the toolchain was not
+  found and not required.
 
 
 <a id="swift_common.is_enabled"></a>
@@ -434,7 +436,7 @@ A new attribute dictionary that can be added to the attributes of a
 ## swift_common.use_toolchain
 
 <pre>
-swift_common.use_toolchain()
+swift_common.use_toolchain(<a href="#swift_common.use_toolchain-mandatory">mandatory</a>)
 </pre>
 
 Returns a list of toolchain types needed to use the Swift toolchain.
@@ -448,10 +450,17 @@ toolchains = use_swift_toolchain() + [other toolchains...]
 ```
 
 
+**PARAMETERS**
+
+
+| Name  | Description | Default Value |
+| :------------- | :------------- | :------------- |
+| <a id="swift_common.use_toolchain-mandatory"></a>mandatory |  Whether or not it should be an error if the toolchain cannot be resolved. Defaults to True.   |  `True` |
 
 **RETURNS**
 
-A list of toolchain types that should be passed to `rule()`, `aspect()`,
-  or `exec_group`.
+A list of
+  [toolchain types](https://bazel.build/rules/lib/builtins/toolchain_type.html)
+  that should be passed to `rule()`, `aspect()`, or `exec_group()`.
 
 
diff --git a/swift/internal/toolchain_utils.bzl b/swift/internal/toolchain_utils.bzl
index 00be74fd6..448789c09 100644
--- a/swift/internal/toolchain_utils.bzl
+++ b/swift/internal/toolchain_utils.bzl
@@ -16,7 +16,12 @@
 
 SWIFT_TOOLCHAIN_TYPE = "@build_bazel_rules_swift//toolchains:toolchain_type"
 
-def get_swift_toolchain(ctx, *, exec_group = None, attr = "_toolchain"):
+def get_swift_toolchain(
+        ctx,
+        *,
+        exec_group = None,
+        mandatory = True,
+        attr = "_toolchain"):
     """Gets the Swift toolchain associated with the rule or aspect.
 
     Args:
@@ -26,6 +31,8 @@ def get_swift_toolchain(ctx, *, exec_group = None, attr = "_toolchain"):
             that execution group, it will be looked up from `ctx` as a fallback
             instead. If this argument is `None` (the default), then the
             toolchain will only be looked up from `ctx.`
+        mandatory: If `False`, this function will return `None` instead of
+            failing if no toolchain is found. Defaults to `True`.
         attr: The name of the attribute on the calling rule or aspect that
             should be used to retrieve the toolchain if it is not provided by
             the `toolchains` argument of the rule/aspect. Note that this is only
@@ -33,7 +40,8 @@ def get_swift_toolchain(ctx, *, exec_group = None, attr = "_toolchain"):
             migration to toolchains is complete.
 
     Returns:
-        A `SwiftToolchainInfo` provider.
+        A `SwiftToolchainInfo` provider, or `None` if the toolchain was not
+        found and not required.
     """
     if exec_group:
         group = ctx.exec_groups[exec_group]
@@ -49,10 +57,14 @@ def get_swift_toolchain(ctx, *, exec_group = None, attr = "_toolchain"):
     if toolchain_target and platform_common.ToolchainInfo in toolchain_target:
         return toolchain_target[platform_common.ToolchainInfo].swift_toolchain
 
-    fail("To use `get_swift_toolchain`, you must declare the toolchain in " +
-         "your rule using `toolchains = use_swift_toolchain()`.")
+    if mandatory:
+        fail("To use `swift_common.get_toolchain`, you must declare the " +
+             "toolchain in your rule using " +
+             "`toolchains = swift_common.use_toolchain()`.")
 
-def use_swift_toolchain():
+    return None
+
+def use_swift_toolchain(*, mandatory = True):
     """Returns a list of toolchain types needed to use the Swift toolchain.
 
     This function returns a list so that it can be easily composed with other
@@ -63,8 +75,18 @@ def use_swift_toolchain():
     toolchains = use_swift_toolchain() + [other toolchains...]
     ```
 
+    Args:
+        mandatory: Whether or not it should be an error if the toolchain cannot
+            be resolved. Defaults to True.
+
     Returns:
-        A list of toolchain types that should be passed to `rule()`, `aspect()`,
-        or `exec_group`.
+        A list of
+        [toolchain types](https://bazel.build/rules/lib/builtins/toolchain_type.html)
+        that should be passed to `rule()`, `aspect()`, or `exec_group()`.
     """
-    return [SWIFT_TOOLCHAIN_TYPE]
+    return [
+        config_common.toolchain_type(
+            SWIFT_TOOLCHAIN_TYPE,
+            mandatory = mandatory,
+        ),
+    ]