diff --git a/DEPS b/DEPS
index 39ab87f..b6244b3 100644
--- a/DEPS
+++ b/DEPS
@@ -63,7 +63,7 @@
   # The list of revisions for these tools comes from Fuchsia, here:
   # https://fuchsia.googlesource.com/integration/+/HEAD/prebuilts
   # If there are problems with the toolchain, contact fuchsia-toolchain@.
-  "clang_revision": "3dc24bc31edbc01dea085b24a6a6b024d7ae531c",
+  "clang_revision": "7c4e9a68264ffeef6178865be76c45c4fb6390af",
   "gn_revision": "39a87c0b36310bdf06b692c098f199a0d97fc810",
 
   # Scripts that make 'git cl format' work.
@@ -199,16 +199,6 @@
     Var("chromium_git") + "/chromium/llvm-project/cfe/tools/clang-format.git" +
     "@" + Var("clang_format_scripts_rev"),
 
-  Var("dart_root") + "/third_party/llvm-build/Release+Asserts": {
-    "packages": [
-      {
-        "package": "flutter/clang/win-amd64",
-        "version": "git_revision:5ec206df8534d2dd8cb9217c3180e5ddba587393"
-      }
-    ],
-    "condition": "download_windows_deps",
-    "dep_type": "cipd",
-  },
   Var("dart_root") + "/benchmarks-internal": {
     "url": Var("dart_internal_git") + "/benchmarks-internal.git" +
            "@" + Var("benchmarks_internal_rev"),
@@ -496,15 +486,35 @@
   Var("dart_root") + "/third_party/pkg/yaml":
       Var("dart_git") + "yaml.git" + "@" + Var("yaml_rev"),
 
-  Var("dart_root") + "/buildtools/" + Var("host_os") + "-x64/clang": {
+  Var("dart_root") + "/buildtools/linux-x64/clang": {
       "packages": [
           {
-              "package": "fuchsia/third_party/clang/" + Var("host_os") + "-amd64",
+              "package": "fuchsia/third_party/clang/linux-amd64",
+              "version": "git_revision:" + Var("clang_revision"),
+          },
+      ],
+      "condition": "host_cpu == x64 and host_os == linux",
+      "dep_type": "cipd",
+  },
+  Var("dart_root") + "/buildtools/mac-x64/clang": {
+      "packages": [
+          {
+              "package": "fuchsia/third_party/clang/mac-amd64",
               "version": "git_revision:" + Var("clang_revision"),
           },
       ],
       # TODO(https://fxbug.dev/73385): Use arm64 toolchain on arm64 when it exists.
-      "condition": "host_cpu == x64 and (host_os == linux or host_os == mac) or host_cpu == arm64 and host_os == mac",
+      "condition": "host_cpu == x64 and host_os == mac or host_cpu == arm64 and host_os == mac",
+      "dep_type": "cipd",
+  },
+  Var("dart_root") + "/buildtools/win-x64/clang": {
+      "packages": [
+          {
+              "package": "fuchsia/third_party/clang/windows-amd64",
+              "version": "git_revision:" + Var("clang_revision"),
+          },
+      ],
+      "condition": "host_cpu == x64 and host_os == win",
       "dep_type": "cipd",
   },
   Var("dart_root") + "/buildtools/linux-arm64/clang": {
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
index 91586be..a064291 100644
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
@@ -552,7 +552,10 @@
   ]
 
   if (is_clang) {
-    default_warning_flags += [ "-Wno-tautological-constant-compare" ]
+    default_warning_flags += [
+      "-Wno-tautological-constant-compare",
+      "-Wno-unused-but-set-variable", # icu
+    ]
   } else {
     default_warning_flags +=
         [ "-Wno-ignored-qualifiers" ]  # Warnings in BoringSSL headers
diff --git a/build/sanitizers/BUILD.gn b/build/sanitizers/BUILD.gn
index f90faa5..e9f8c7a 100644
--- a/build/sanitizers/BUILD.gn
+++ b/build/sanitizers/BUILD.gn
@@ -6,12 +6,10 @@
   # TODO(GYP): Figure out which of these work and are needed on other platforms.
   copy("copy_llvm_symbolizer") {
     if (is_win) {
-      sources =
-          [ "//third_party/llvm-build/Release+Asserts/bin/llvm-symbolizer.exe" ]
+      sources = [ "//buildtools/win-x64/clang/bin/llvm-symbolizer.exe" ]
       outputs = [ "$root_out_dir/llvm-symbolizer.exe" ]
     } else {
-      sources =
-          [ "//third_party/llvm-build/Release+Asserts/bin/llvm-symbolizer" ]
+      sources = [ "//buildtools/win-x64/clang/bin/llvm-symbolizer" ]
       outputs = [ "$root_out_dir/llvm-symbolizer" ]
     }
   }
diff --git a/build/toolchain/win/BUILD.gn b/build/toolchain/win/BUILD.gn
index 478e39c..7eb0f12 100644
--- a/build/toolchain/win/BUILD.gn
+++ b/build/toolchain/win/BUILD.gn
@@ -260,8 +260,7 @@
   msvc_toolchain("clang_x86") {
     environment = "environment.x86"
     current_cpu = "x86"
-    prefix = rebase_path("//third_party/llvm-build/Release+Asserts/bin",
-                         root_build_dir)
+    prefix = rebase_path("//buildtools/win-x64/clang/bin", root_build_dir)
     cl = "${goma_prefix}$prefix/clang-cl.exe"
     is_clang = true
   }
@@ -277,8 +276,7 @@
   msvc_toolchain("clang_x64") {
     environment = "environment.x64"
     current_cpu = "x64"
-    prefix = rebase_path("//third_party/llvm-build/Release+Asserts/bin",
-                         root_build_dir)
+    prefix = rebase_path("//buildtools/win-x64/clang/bin", root_build_dir)
     cl = "${goma_prefix}$prefix/clang-cl.exe"
     is_clang = true
   }
diff --git a/third_party/tcmalloc/BUILD.gn b/third_party/tcmalloc/BUILD.gn
index 7238772..0eb6244 100644
--- a/third_party/tcmalloc/BUILD.gn
+++ b/third_party/tcmalloc/BUILD.gn
@@ -16,6 +16,7 @@
     "-Wno-unused-result",
     "-Wno-unused-parameter",
     "-Wno-unused-function",
+    "-Wno-unused-but-set-variable",
     "-Wno-vla",
     "-g3",
     "-ggdb3",
diff --git a/tools/VERSION b/tools/VERSION
index 991514c..2c257e5 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -27,5 +27,5 @@
 MAJOR 2
 MINOR 14
 PATCH 0
-PRERELEASE 237
+PRERELEASE 238
 PRERELEASE_PATCH 0
\ No newline at end of file