From 5c429032ce196f1aaad5830d2b9d6a14937bd67c Mon Sep 17 00:00:00 2001 From: Chase Latta Date: Fri, 22 Jan 2021 00:18:49 +0000 Subject: [PATCH] use a single clang toolchain --- build/fuchsia/sdk.gni | 2 +- build/toolchain/fuchsia/BUILD.gn | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/fuchsia/sdk.gni b/build/fuchsia/sdk.gni index 2c4d9d9e80..49960a1266 100644 --- a/build/fuchsia/sdk.gni +++ b/build/fuchsia/sdk.gni @@ -15,7 +15,7 @@ declare_args() { # The following variables are Flutter buildroot specific. fuchsia_sdk_path = "//fuchsia/sdk/$host_os" - fuchsia_toolchain_path = "//fuchsia/toolchain/$host_os" + fuchsia_toolchain_path = "//buildtools/${host_os}-${host_cpu}/clang" } declare_args() { diff --git a/build/toolchain/fuchsia/BUILD.gn b/build/toolchain/fuchsia/BUILD.gn index d01e4f788d..a2af754397 100644 --- a/build/toolchain/fuchsia/BUILD.gn +++ b/build/toolchain/fuchsia/BUILD.gn @@ -14,7 +14,7 @@ if (use_goma) { toolchain("fuchsia") { assert(target_cpu == "x64" || target_cpu == "arm64", "We currently only support 'x64' and 'arm64' targets for fuchsia.") - toolchain_bin = rebase_path("//fuchsia/toolchain/$host_os/bin", root_out_dir) + toolchain_bin = rebase_path("//buildtools/${host_os}-${host_cpu}/clang/bin", root_out_dir) fuchsia_sdk = rebase_path("//fuchsia/sdk/$host_os", root_out_dir) # We can't do string interpolation ($ in strings) on things with dots in