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

Side by Side Diff: build/config/BUILDCONFIG.gn

Issue 141433015: GN build fixes, mostly for Mac. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: put back sha1 file Created 6 years, 11 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | build/config/clang/BUILD.gn » ('j') | build/config/clang/BUILD.gn » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 # Copyright (c) 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 # ============================================================================= 5 # =============================================================================
6 # BUILD FLAGS 6 # BUILD FLAGS
7 # ============================================================================= 7 # =============================================================================
8 # 8 #
9 # This block lists input arguments to the build, along with their default 9 # This block lists input arguments to the build, along with their default
10 # values. GN requires listing them explicitly so it can validate input and have 10 # values. GN requires listing them explicitly so it can validate input and have
(...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after
154 is_win = false 154 is_win = false
155 } else if (os == "ios") { 155 } else if (os == "ios") {
156 is_android = false 156 is_android = false
157 is_chromeos = false 157 is_chromeos = false
158 is_ios = true 158 is_ios = true
159 is_linux = false 159 is_linux = false
160 is_mac = false 160 is_mac = false
161 is_nacl = false 161 is_nacl = false
162 is_posix = true 162 is_posix = true
163 is_win = false 163 is_win = false
164 if (!is_clang) {
165 # Always use clang on iOS when using ninja
166 # (which is always true when using GN).
Nico 2014/01/27 19:42:27 This isn't correct: gn will generate a re2.gyp fil
167 is_clang = true
168 }
164 } else if (os == "linux") { 169 } else if (os == "linux") {
165 is_android = false 170 is_android = false
166 is_chromeos = false 171 is_chromeos = false
167 is_ios = false 172 is_ios = false
168 is_linux = true 173 is_linux = true
169 is_mac = false 174 is_mac = false
170 is_nacl = false 175 is_nacl = false
171 is_posix = true 176 is_posix = true
172 is_win = false 177 is_win = false
173 } 178 }
(...skipping 261 matching lines...) Expand 10 before | Expand all | Expand 10 after
435 } else if (is_android) { 440 } else if (is_android) {
436 host_toolchain = "//build/toolchain/linux:$build_cpu_arch" 441 host_toolchain = "//build/toolchain/linux:$build_cpu_arch"
437 set_default_toolchain("//build/toolchain/android:$cpu_arch") 442 set_default_toolchain("//build/toolchain/android:$cpu_arch")
438 } else if (is_linux) { 443 } else if (is_linux) {
439 host_toolchain = "//build/toolchain/linux:$build_cpu_arch" 444 host_toolchain = "//build/toolchain/linux:$build_cpu_arch"
440 set_default_toolchain("//build/toolchain/linux:$cpu_arch") 445 set_default_toolchain("//build/toolchain/linux:$cpu_arch")
441 } else if (is_mac || is_ios) { 446 } else if (is_mac || is_ios) {
442 host_toolchain = "//build/toolchain/mac:clang" 447 host_toolchain = "//build/toolchain/mac:clang"
443 set_default_toolchain(host_toolchain) 448 set_default_toolchain(host_toolchain)
444 } 449 }
OLDNEW
« no previous file with comments | « no previous file | build/config/clang/BUILD.gn » ('j') | build/config/clang/BUILD.gn » ('J')

Powered by Google App Engine
This is Rietveld 408576698