| Index: build/toolchain/linux/BUILD.gn
|
| diff --git a/build/toolchain/linux/BUILD.gn b/build/toolchain/linux/BUILD.gn
|
| index 9145284187c94d41ce64e26908a957c2e50431e6..94d9a16a23e6465240c645b058281418ce8bc7a2 100644
|
| --- a/build/toolchain/linux/BUILD.gn
|
| +++ b/build/toolchain/linux/BUILD.gn
|
| @@ -4,7 +4,6 @@
|
|
|
| import("//build/config/sysroot.gni")
|
| import("//build/toolchain/ccache.gni")
|
| -import("//build/toolchain/clang.gni")
|
| import("//build/toolchain/gcc_toolchain.gni")
|
| import("//build/toolchain/goma.gni")
|
|
|
| @@ -32,13 +31,8 @@ gcc_toolchain("arm") {
|
| }
|
|
|
| gcc_toolchain("clang_x86") {
|
| - if (use_clang_type_profiler) {
|
| - prefix = rebase_path("//third_party/llvm-allocated-type/Linux_ia32/bin",
|
| - root_build_dir)
|
| - } else {
|
| - prefix = rebase_path("//third_party/llvm-build/Release+Asserts/bin",
|
| - root_build_dir)
|
| - }
|
| + prefix = rebase_path("//third_party/llvm-build/Release+Asserts/bin",
|
| + root_build_dir)
|
| cc = "${compiler_prefix}$prefix/clang"
|
| cxx = "${compiler_prefix}$prefix/clang++"
|
| readelf = "readelf"
|
| @@ -66,13 +60,8 @@ gcc_toolchain("x86") {
|
| }
|
|
|
| gcc_toolchain("clang_x64") {
|
| - if (use_clang_type_profiler) {
|
| - prefix = rebase_path("//third_party/llvm-allocated-type/Linux_x64/bin",
|
| - root_build_dir)
|
| - } else {
|
| - prefix = rebase_path("//third_party/llvm-build/Release+Asserts/bin",
|
| - root_build_dir)
|
| - }
|
| + prefix = rebase_path("//third_party/llvm-build/Release+Asserts/bin",
|
| + root_build_dir)
|
| cc = "${compiler_prefix}$prefix/clang"
|
| cxx = "${compiler_prefix}$prefix/clang++"
|
|
|
|
|