From 97311ef198a884e39a008384c0d93d2d2572d917 Mon Sep 17 00:00:00 2001
From: Jordan Mele <mele@canva.com>
Date: Sun, 9 Jan 2022 16:45:56 +1100
Subject: [PATCH] .

---
 tools/cpp/cc_toolchain_config.bzl | 4 +++-
 tools/cpp/unix_cc_configure.bzl   | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/tools/cpp/cc_toolchain_config.bzl b/tools/cpp/cc_toolchain_config.bzl
index 807e769ae8dafc..3734b8db9a32cf 100644
--- a/tools/cpp/cc_toolchain_config.bzl
+++ b/tools/cpp/cc_toolchain_config.bzl
@@ -336,6 +336,7 @@ def _impl(ctx):
     )
 
     if (ctx.attr.cpu == "local"):
+        # TODO Potential error source, different platforms need different args
         default_link_flags_feature = feature(
             name = "default_link_flags",
             enabled = True,
@@ -395,7 +396,8 @@ def _impl(ctx):
                     flag_groups = [
                         flag_group(
                             flags = [
-                                "-lstdc++",
+                                # TODO Change based on XCode version (libstdc++ removed in XCode 10)
+                                "-lc++",
                                 "-undefined",
                                 "dynamic_lookup",
                                 "-headerpad_max_install_names",
diff --git a/tools/cpp/unix_cc_configure.bzl b/tools/cpp/unix_cc_configure.bzl
index 27e46531461b34..07e53ea9378978 100644
--- a/tools/cpp/unix_cc_configure.bzl
+++ b/tools/cpp/unix_cc_configure.bzl
@@ -400,7 +400,8 @@ def configure_unix_toolchain(repository_ctx, cpu_value, overriden_tools):
         False,
     ), ":")
 
-    bazel_linkopts = "-lstdc++:-lm"
+    # TODO Older XCode versions may not have libc++
+    bazel_linkopts = "-lc++:-lm" if darwin else "-lstdc++:-lm"
     bazel_linklibs = ""
     if repository_ctx.flag_enabled("incompatible_linkopts_to_linklibs"):
         bazel_linkopts, bazel_linklibs = bazel_linklibs, bazel_linkopts