diff --git a/tools/cpp/BUILD b/tools/cpp/BUILD
index db5fa06..5c36559 100644
--- a/tools/cpp/BUILD
+++ b/tools/cpp/BUILD
@@ -1,19 +1,11 @@
 load(":toolchain_config.bzl", "cc_toolchain_config")
+load(":toolchain_make_variables.bzl", "cc_toolchain_make_variables")
 
 package(default_visibility = ["//visibility:public"])
 
-cc_toolchain_suite(
-    name = "toolchain",
-    toolchains = {
-        "k8": "@llvm_toolchain//:cc-clang-x86_64-linux",
-        "armv7": "@llvm_toolchain//:cc-clang-armv7-linux",
-        "arm64": "@llvm_toolchain//:cc-clang-aarch64-linux",
-        "roborio": ":cc-compiler-roborio",
-        "cortex-m4f": ":cc-compiler-cortex-m4f",
-        "rp2040": ":cc-compiler-rp2040",
-    },
-    visibility = ["//visibility:public"],
-)
+# Use this instead of @bazel_tools//tools/cpp:current_cc_toolchain.
+# This one supports platforms.
+cc_toolchain_make_variables(name = "cc_toolchain_make_variables")
 
 [
     cc_toolchain_config(
diff --git a/tools/cpp/toolchain_make_variables.bzl b/tools/cpp/toolchain_make_variables.bzl
new file mode 100644
index 0000000..7c06e1d
--- /dev/null
+++ b/tools/cpp/toolchain_make_variables.bzl
@@ -0,0 +1,39 @@
+load("@bazel_tools//tools/cpp:toolchain_utils.bzl", "find_cpp_toolchain")
+
+def _cc_toolchain_make_variables_impl(ctx):
+    """Supports make variables for toolchains in a platforms setup.
+
+    The upstream @bazel_tools//tools/cpp:current_cc_toolchain target on its own
+    doesn't appear to work with platforms. It only works when using --cpu.
+    """
+    toolchain = find_cpp_toolchain(ctx)
+
+    feature_configuration = cc_common.configure_features(
+        ctx = ctx,
+        cc_toolchain = toolchain,
+        requested_features = ctx.features,
+        unsupported_features = ctx.disabled_features,
+    )
+    objcopy = cc_common.get_tool_for_action(
+        feature_configuration = feature_configuration,
+        action_name = "objcopy_embed_data",
+    )
+
+    return [
+        platform_common.TemplateVariableInfo({
+            "OBJCOPY": objcopy,
+        }),
+        DefaultInfo(files = toolchain.all_files),
+    ]
+
+cc_toolchain_make_variables = rule(
+    implementation = _cc_toolchain_make_variables_impl,
+    attrs = {
+        # This is a dependency of find_cpp_toolchain().
+        "_toolchain": attr.label(
+            default = Label("@bazel_tools//tools/cpp:current_cc_toolchain"),
+        ),
+    },
+    fragments = ["cpp"],
+    toolchains = ["@bazel_tools//tools/cpp:toolchain_type"],
+)