| Index: build/toolchain/gcc_toolchain.gni
|
| diff --git a/build/toolchain/gcc_toolchain.gni b/build/toolchain/gcc_toolchain.gni
|
| index 38e5fb6d3e97d211417865fe4a6f6f91bfefb8af..a4578f5bb2433eaaa4e2fed67da8a9e6881d1e5a 100644
|
| --- a/build/toolchain/gcc_toolchain.gni
|
| +++ b/build/toolchain/gcc_toolchain.gni
|
| @@ -425,6 +425,10 @@ template("gcc_toolchain") {
|
| }
|
| }
|
|
|
| +declare_args() {
|
| + clang_dir = "//third_party/llvm-build/Release+Asserts"
|
| +}
|
| +
|
| # This is a shorthand for gcc_toolchain instances based on the
|
| # Chromium-built version of Clang. Only the toolchain_cpu and
|
| # toolchain_os variables need to be specified by the invoker, and
|
| @@ -444,8 +448,7 @@ template("clang_toolchain") {
|
| }
|
|
|
| gcc_toolchain(target_name) {
|
| - prefix = rebase_path("//third_party/llvm-build/Release+Asserts/bin",
|
| - root_build_dir)
|
| + prefix = rebase_path(clang_dir + "/bin", root_build_dir)
|
| cc = "$prefix/clang"
|
| cxx = "$prefix/clang++"
|
| ld = cxx
|
|
|