Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(334)

Side by Side Diff: build/toolchain/linux/BUILD.gn

Issue 2858873005: [infra] Roll clang to match the version used by Flutter (Closed)
Patch Set: Fix Mac Android build Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 ld = cxx 53 ld = cxx
54 readelf = "${prefix}readelf" 54 readelf = "${prefix}readelf"
55 nm = "${prefix}nm" 55 nm = "${prefix}nm"
56 56
57 toolchain_cpu = "arm64" 57 toolchain_cpu = "arm64"
58 toolchain_os = "linux" 58 toolchain_os = "linux"
59 is_clang = false 59 is_clang = false
60 } 60 }
61 61
62 gcc_toolchain("clang_x86") { 62 gcc_toolchain("clang_x86") {
63 prefix = rebase_path("//third_party/llvm-build/Release+Asserts/bin", 63 prefix = rebase_path("//buildtools/toolchain/clang+llvm-x86_64-linux/bin",
64 root_build_dir) 64 root_build_dir)
65 cc = "${compiler_prefix}$prefix/clang" 65 cc = "${compiler_prefix}$prefix/clang"
66 cxx = "${compiler_prefix}$prefix/clang++" 66 cxx = "${compiler_prefix}$prefix/clang++"
67 readelf = "readelf" 67 readelf = "readelf"
68 nm = "nm" 68 nm = "nm"
69 ar = "ar" 69 ar = "ar"
70 ld = cxx 70 ld = cxx
71 71
72 toolchain_cpu = "x86" 72 toolchain_cpu = "x86"
73 toolchain_os = "linux" 73 toolchain_os = "linux"
74 is_clang = true 74 is_clang = true
75 } 75 }
76 76
77 gcc_toolchain("x86") { 77 gcc_toolchain("x86") {
78 cc = "${compiler_prefix}gcc" 78 cc = "${compiler_prefix}gcc"
79 cxx = "${compiler_prefix}g++" 79 cxx = "${compiler_prefix}g++"
80 80
81 readelf = "readelf" 81 readelf = "readelf"
82 nm = "nm" 82 nm = "nm"
83 ar = "ar" 83 ar = "ar"
84 ld = cxx 84 ld = cxx
85 85
86 toolchain_cpu = "x86" 86 toolchain_cpu = "x86"
87 toolchain_os = "linux" 87 toolchain_os = "linux"
88 is_clang = false 88 is_clang = false
89 } 89 }
90 90
91 gcc_toolchain("clang_x64") { 91 gcc_toolchain("clang_x64") {
92 prefix = rebase_path("//third_party/llvm-build/Release+Asserts/bin", 92 prefix = rebase_path("//buildtools/toolchain/clang+llvm-x86_64-linux/bin",
93 root_build_dir) 93 root_build_dir)
94 cc = "${compiler_prefix}$prefix/clang" 94 cc = "${compiler_prefix}$prefix/clang"
95 cxx = "${compiler_prefix}$prefix/clang++" 95 cxx = "${compiler_prefix}$prefix/clang++"
96 96
97 readelf = "readelf" 97 readelf = "readelf"
98 nm = "nm" 98 nm = "nm"
99 ar = "ar" 99 ar = "ar"
100 ld = cxx 100 ld = cxx
101 101
102 toolchain_cpu = "x64" 102 toolchain_cpu = "x64"
(...skipping 20 matching lines...) Expand all
123 cxx = "${compiler_prefix}${toolchain_prefix}g++" 123 cxx = "${compiler_prefix}${toolchain_prefix}g++"
124 ar = "${toolchain_prefix}ar" 124 ar = "${toolchain_prefix}ar"
125 ld = cxx 125 ld = cxx
126 readelf = "${toolchain_prefix}readelf" 126 readelf = "${toolchain_prefix}readelf"
127 nm = "${toolchain_prefix}nm" 127 nm = "${toolchain_prefix}nm"
128 128
129 toolchain_cpu = "${target_cpu}" 129 toolchain_cpu = "${target_cpu}"
130 toolchain_os = "linux" 130 toolchain_os = "linux"
131 is_clang = is_clang 131 is_clang = is_clang
132 } 132 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698