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

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

Issue 1467413005: GN: Propagate top-level host_toolchain through to all toolchains (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix assert Created 5 years 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
« build/config/BUILDCONFIG.gn ('K') | « build/toolchain/mac/BUILD.gn ('k') | no next file » | no next file with comments »
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 import("//build/config/win/visual_studio_version.gni") 5 import("//build/config/win/visual_studio_version.gni")
6 import("//build/toolchain/goma.gni") 6 import("//build/toolchain/goma.gni")
7 import("//build/toolchain/toolchain.gni") 7 import("//build/toolchain/toolchain.gni")
8 8
9 # Should only be running on Windows. 9 # Should only be running on Windows.
10 assert(is_win) 10 assert(is_win)
(...skipping 202 matching lines...) Expand 10 before | Expand all | Expand 10 after
213 } 213 }
214 214
215 # When invoking this toolchain not as the default one, these args will be 215 # When invoking this toolchain not as the default one, these args will be
216 # passed to the build. They are ignored when this is the default toolchain. 216 # passed to the build. They are ignored when this is the default toolchain.
217 toolchain_args() { 217 toolchain_args() {
218 current_cpu = invoker.current_cpu 218 current_cpu = invoker.current_cpu
219 if (defined(invoker.is_clang)) { 219 if (defined(invoker.is_clang)) {
220 is_clang = invoker.is_clang 220 is_clang = invoker.is_clang
221 } 221 }
222 current_os = invoker.current_os 222 current_os = invoker.current_os
223
224 # This value needs to be passed through unchanged.
225 host_toolchain = host_toolchain
223 } 226 }
224 } 227 }
225 } 228 }
226 229
227 # 32-bit toolchains. Only define these when the target architecture is 32-bit 230 # 32-bit toolchains. Only define these when the target architecture is 32-bit
228 # since we don't do any 32-bit cross compiles when targeting 64-bit (the 231 # since we don't do any 32-bit cross compiles when targeting 64-bit (the
229 # build does generate some 64-bit stuff from 32-bit target builds). 232 # build does generate some 64-bit stuff from 32-bit target builds).
230 if (target_cpu == "x86") { 233 if (target_cpu == "x86") {
231 x86_toolchain_data = exec_script("setup_toolchain.py", 234 x86_toolchain_data = exec_script("setup_toolchain.py",
232 [ 235 [
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
302 305
303 msvc_toolchain("winrt_x64") { 306 msvc_toolchain("winrt_x64") {
304 environment = "environment.winrt_x64" 307 environment = "environment.winrt_x64"
305 cl = "${goma_prefix}\"${vc_bin_dir}/cl.exe\"" 308 cl = "${goma_prefix}\"${vc_bin_dir}/cl.exe\""
306 is_clang = false 309 is_clang = false
307 310
308 current_cpu = "x64" 311 current_cpu = "x64"
309 current_os = current_os 312 current_os = current_os
310 } 313 }
311 } 314 }
OLDNEW
« build/config/BUILDCONFIG.gn ('K') | « build/toolchain/mac/BUILD.gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698