OLD | NEW |
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 declare_args() { | 5 declare_args() { |
6 # Path to the directory containing the VC binaries for the right | 6 # Path to the directory containing the VC binaries for the right |
7 # combination of host and target architectures. Currently only the | 7 # combination of host and target architectures. Currently only the |
8 # 64-bit host toolchain is supported, with either 32-bit or 64-bit targets. | 8 # 64-bit host toolchain is supported, with either 32-bit or 64-bit targets. |
9 # If vc_bin_dir is not specified on the command line (and it normally | 9 # If vc_bin_dir is not specified on the command line (and it normally |
10 # isn't), we will dynamically determine the right value to use at runtime. | 10 # isn't), we will dynamically determine the right value to use at runtime. |
(...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
193 | 193 |
194 tool("copy") { | 194 tool("copy") { |
195 command = | 195 command = |
196 "$python_path gyp-win-tool recursive-mirror {{source}} {{output}}" | 196 "$python_path gyp-win-tool recursive-mirror {{source}} {{output}}" |
197 description = "COPY {{source}} {{output}}" | 197 description = "COPY {{source}} {{output}}" |
198 } | 198 } |
199 | 199 |
200 # When invoking this toolchain not as the default one, these args will be | 200 # When invoking this toolchain not as the default one, these args will be |
201 # passed to the build. They are ignored when this is the default toolchain. | 201 # passed to the build. They are ignored when this is the default toolchain. |
202 toolchain_args() { | 202 toolchain_args() { |
203 cpu_arch = invoker.cpu_arch | 203 current_cpu = invoker.current_cpu |
| 204 |
| 205 # TODO(dpranke): cpu_arch is here for backwards compatibility. |
| 206 cpu_arch = current_cpu |
204 } | 207 } |
205 } | 208 } |
206 } | 209 } |
207 | 210 |
208 # TODO(dpranke): Declare both toolchains all of the time when we | 211 # TODO(dpranke): Declare both toolchains all of the time when we |
209 # get it sorted out how we want to support them both in a single build. | 212 # get it sorted out how we want to support them both in a single build. |
210 # Right now only one of these can be enabled at a time because the | 213 # Right now only one of these can be enabled at a time because the |
211 # runtime libraries get copied to root_build_dir and would collide. | 214 # runtime libraries get copied to root_build_dir and would collide. |
212 if (cpu_arch == "x86") { | 215 if (cpu_arch == "x86") { |
213 msvc_toolchain("32") { | 216 msvc_toolchain("32") { |
214 environment = "environment.x86" | 217 environment = "environment.x86" |
215 cpu_arch = "x86" | 218 |
| 219 current_cpu = "x86" |
216 } | 220 } |
217 } | 221 } |
218 | 222 |
219 if (cpu_arch == "x64") { | 223 if (cpu_arch == "x64") { |
220 msvc_toolchain("64") { | 224 msvc_toolchain("64") { |
221 environment = "environment.x64" | 225 environment = "environment.x64" |
222 cpu_arch = "x64" | 226 |
| 227 current_cpu = "x64" |
223 } | 228 } |
224 } | 229 } |
OLD | NEW |