| OLD | NEW |
|---|
| 1 # Copyright 2013 The Chromium Authors. All rights reserved. | 1 # Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 import("//build/config/sysroot.gni") | 5 import("//build/config/sysroot.gni") |
| 6 import("//build/toolchain/ccache.gni") | 6 import("//build/toolchain/ccache.gni") |
| 7 import("//build/toolchain/clang.gni") | 7 import("//build/toolchain/clang.gni") |
| 8 import("//build/toolchain/gcc_toolchain.gni") | 8 import("//build/toolchain/gcc_toolchain.gni") |
| 9 import("//build/toolchain/goma.gni") | 9 import("//build/toolchain/goma.gni") |
| 10 | 10 |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 56 readelf = "${prefix}readelf" | 56 readelf = "${prefix}readelf" |
| 57 nm = "${prefix}nm" | 57 nm = "${prefix}nm" |
| 58 strip = "${prefix}strip" | 58 strip = "${prefix}strip" |
| 59 | 59 |
| 60 toolchain_cpu = "arm64" | 60 toolchain_cpu = "arm64" |
| 61 toolchain_os = "linux" | 61 toolchain_os = "linux" |
| 62 is_clang = false | 62 is_clang = false |
| 63 } | 63 } |
| 64 | 64 |
| 65 gcc_toolchain("clang_x86") { | 65 gcc_toolchain("clang_x86") { |
| 66 prefix = rebase_path("//buildtools/toolchain/clang+llvm-x86_64-linux/bin", | 66 prefix = rebase_path("//buildtools/linux-x64/clang/bin", root_build_dir) |
| 67 root_build_dir) | |
| 68 cc = "${compiler_prefix}${prefix}/clang" | 67 cc = "${compiler_prefix}${prefix}/clang" |
| 69 cxx = "${compiler_prefix}${prefix}/clang++" | 68 cxx = "${compiler_prefix}${prefix}/clang++" |
| 70 readelf = "readelf" | 69 readelf = "readelf" |
| 71 nm = "${prefix}/llvm-nm" | 70 nm = "${prefix}/llvm-nm" |
| 72 ar = "${prefix}/llvm-ar" | 71 ar = "${prefix}/llvm-ar" |
| 73 ld = cxx | 72 ld = cxx |
| 74 strip = "${prefix}/strip" | 73 strip = "${prefix}/strip" |
| 75 | 74 |
| 76 toolchain_cpu = "x86" | 75 toolchain_cpu = "x86" |
| 77 toolchain_os = "linux" | 76 toolchain_os = "linux" |
| (...skipping 10 matching lines...) Expand all Loading... |
| 88 ar = "${prefix}ar" | 87 ar = "${prefix}ar" |
| 89 ld = cxx | 88 ld = cxx |
| 90 strip = "${prefix}strip" | 89 strip = "${prefix}strip" |
| 91 | 90 |
| 92 toolchain_cpu = "x86" | 91 toolchain_cpu = "x86" |
| 93 toolchain_os = "linux" | 92 toolchain_os = "linux" |
| 94 is_clang = false | 93 is_clang = false |
| 95 } | 94 } |
| 96 | 95 |
| 97 gcc_toolchain("clang_x64") { | 96 gcc_toolchain("clang_x64") { |
| 98 prefix = rebase_path("//buildtools/toolchain/clang+llvm-x86_64-linux/bin", | 97 prefix = rebase_path("//buildtools/linux-x64/clang/bin", root_build_dir) |
| 99 root_build_dir) | |
| 100 cc = "${compiler_prefix}${prefix}/clang" | 98 cc = "${compiler_prefix}${prefix}/clang" |
| 101 cxx = "${compiler_prefix}${prefix}/clang++" | 99 cxx = "${compiler_prefix}${prefix}/clang++" |
| 102 | 100 |
| 103 readelf = "readelf" | 101 readelf = "readelf" |
| 104 nm = "${prefix}/llvm-nm" | 102 nm = "${prefix}/llvm-nm" |
| 105 ar = "${prefix}/llvm-ar" | 103 ar = "${prefix}/llvm-ar" |
| 106 ld = cxx | 104 ld = cxx |
| 107 strip = "${prefix}/strip" | 105 strip = "${prefix}/strip" |
| 108 | 106 |
| 109 toolchain_cpu = "x64" | 107 toolchain_cpu = "x64" |
| 110 toolchain_os = "linux" | 108 toolchain_os = "linux" |
| 111 is_clang = true | 109 is_clang = true |
| 112 } | 110 } |
| 113 | 111 |
| 114 gcc_toolchain("x64") { | 112 gcc_toolchain("x64") { |
| 115 prefix = "" | 113 prefix = "" |
| 116 cc = "${compiler_prefix}${prefix}gcc" | 114 cc = "${compiler_prefix}${prefix}gcc" |
| 117 cxx = "${compiler_prefix}${prefix}g++" | 115 cxx = "${compiler_prefix}${prefix}g++" |
| 118 | 116 |
| 119 readelf = "${prefix}readelf" | 117 readelf = "${prefix}readelf" |
| 120 nm = "${prefix}nm" | 118 nm = "${prefix}nm" |
| 121 ar = "${prefix}ar" | 119 ar = "${prefix}ar" |
| 122 ld = cxx | 120 ld = cxx |
| 123 strip = "${prefix}strip" | 121 strip = "${prefix}strip" |
| 124 | 122 |
| 125 toolchain_cpu = "x64" | 123 toolchain_cpu = "x64" |
| 126 toolchain_os = "linux" | 124 toolchain_os = "linux" |
| 127 is_clang = false | 125 is_clang = false |
| 128 } | 126 } |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 3010023002:
Reland: [infra] Roll clang toolchain forward (Closed)
