diff --git a/.circleci/config.yml b/.circleci/config.yml
index 0750cfa46e..6bddcc95ea 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -43,9 +43,10 @@ jobs:
     steps:
       - checkout
       - run: ./ci/setup_ci_environment.sh
+      - run: ./ci/setup_cmake.sh
       - run: ./ci/install_bazelisk.sh
       - run: ./ci/install_gcc48.sh
-      - run: CC=/usr/bin/gcc-4.8 ./ci/do_ci.sh bazel.legacy.test
+      - run: CC=/usr/bin/gcc-4.8 CXX=/usr/bin/g++-4.8 ./ci/do_ci.sh bazel.legacy.test
 
   bazel_test:
     resource_class: xlarge
@@ -54,6 +55,7 @@ jobs:
     steps:
       - checkout
       - run: ./ci/setup_ci_environment.sh
+      - run: ./ci/setup_cmake.sh
       - run: ./ci/install_bazelisk.sh
       - run: ./ci/do_ci.sh bazel.test
 
@@ -64,6 +66,7 @@ jobs:
     steps:
       - checkout
       - run: ./ci/setup_ci_environment.sh
+      - run: ./ci/setup_cmake.sh
       - run: ./ci/install_bazelisk.sh
       - run: ./ci/do_ci.sh bazel.noexcept
 
@@ -74,6 +77,7 @@ jobs:
     steps:
       - checkout
       - run: ./ci/setup_ci_environment.sh
+      - run: ./ci/setup_cmake.sh
       - run: ./ci/install_bazelisk.sh
       - run: ./ci/do_ci.sh bazel.asan
 
@@ -84,6 +88,7 @@ jobs:
     steps:
       - checkout
       - run: ./ci/setup_ci_environment.sh
+      - run: ./ci/setup_cmake.sh
       - run: ./ci/install_bazelisk.sh
       - run: ./ci/do_ci.sh bazel.tsan
 
@@ -94,6 +99,7 @@ jobs:
     steps:
       - checkout
       - run: ./ci/setup_ci_environment.sh
+      - run: ./ci/setup_cmake.sh
       - run: ./ci/install_bazelisk.sh
       - run: env BENCHMARK_DIR=/benchmark ./ci/do_ci.sh benchmark
       - store_artifacts:
@@ -115,6 +121,7 @@ jobs:
       xcode: "11.0.0"
     steps:
       - checkout
+      - run: ./ci/install_osx_cmake.sh
       - run: ./ci/install_osx_bazelisk.sh
       - run: ./ci/do_ci.sh bazel.test
 
@@ -135,6 +142,7 @@ jobs:
     executor: win/vs2019
     steps:
       - checkout
+      - run: ./ci/setup_windows_cmake.ps1
       - run: ./ci/install_windows_bazelisk.ps1
       - run: ./ci/do_ci.ps1 bazel.build
 
diff --git a/WORKSPACE b/WORKSPACE
index 3270f100e9..8e0d1dc65b 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -55,10 +55,6 @@ http_archive(
 load("@rules_foreign_cc//:workspace_definitions.bzl", "rules_foreign_cc_dependencies")
 
 rules_foreign_cc_dependencies([
-    "//bazel:built_cmake_toolchain_osx",
-    "//bazel:built_ninja_toolchain_osx",
-    "//bazel:built_cmake_toolchain_linux",
-    "//bazel:built_ninja_toolchain_linux",
 ])
 
 http_archive(
diff --git a/bazel/BUILD b/bazel/BUILD
index a0f906485b..2d352a7d30 100644
--- a/bazel/BUILD
+++ b/bazel/BUILD
@@ -4,43 +4,3 @@ config_setting(
     name = "windows",
     constraint_values = ["@bazel_tools//platforms:windows"],
 )
-
-toolchain(
-    name = "built_cmake_toolchain_osx",
-    exec_compatible_with = [
-        "@bazel_tools//platforms:osx",
-        "@bazel_tools//platforms:x86_64",
-    ],
-    toolchain = "@rules_foreign_cc//tools/build_defs/native_tools:built_cmake",
-    toolchain_type = "@rules_foreign_cc//tools/build_defs:cmake_toolchain",
-)
-
-toolchain(
-    name = "built_ninja_toolchain_osx",
-    exec_compatible_with = [
-        "@bazel_tools//platforms:osx",
-        "@bazel_tools//platforms:x86_64",
-    ],
-    toolchain = "@rules_foreign_cc//tools/build_defs/native_tools:built_ninja",
-    toolchain_type = "@rules_foreign_cc//tools/build_defs:ninja_toolchain",
-)
-
-toolchain(
-    name = "built_cmake_toolchain_linux",
-    exec_compatible_with = [
-        "@bazel_tools//platforms:linux",
-        "@bazel_tools//platforms:x86_64",
-    ],
-    toolchain = "@rules_foreign_cc//tools/build_defs/native_tools:built_cmake",
-    toolchain_type = "@rules_foreign_cc//tools/build_defs:cmake_toolchain",
-)
-
-toolchain(
-    name = "built_ninja_toolchain_linux",
-    exec_compatible_with = [
-        "@bazel_tools//platforms:linux",
-        "@bazel_tools//platforms:x86_64",
-    ],
-    toolchain = "@rules_foreign_cc//tools/build_defs/native_tools:built_ninja",
-    toolchain_type = "@rules_foreign_cc//tools/build_defs:ninja_toolchain",
-)
diff --git a/ci/install_osx_bazelisk.sh b/ci/install_osx_bazelisk.sh
deleted file mode 100755
index 9c09285051..0000000000
--- a/ci/install_osx_bazelisk.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-set -e
-
-brew install bazelisk
-sudo ln -s /usr/local/bin/bazelisk /usr/local/bin/bazel
diff --git a/ci/install_osx_cmake.sh b/ci/install_osx_cmake.sh
new file mode 100755
index 0000000000..5bbe1eda01
--- /dev/null
+++ b/ci/install_osx_cmake.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+set -e
+
+brew install cmake