| 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 # This value will be inherited in the toolchain below. | 5 # This value will be inherited in the toolchain below. |
| 6 concurrent_links = exec_script("get_concurrent_links.py", [], "value") | 6 concurrent_links = exec_script("get_concurrent_links.py", [], "value") |
| 7 | 7 |
| 8 # This template defines a toolchain for something that works like gcc | 8 # This template defines a toolchain for something that works like gcc |
| 9 # (including clang). | 9 # (including clang). |
| 10 # | 10 # |
| (...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 204 # When invoking this toolchain not as the default one, these args will be | 204 # When invoking this toolchain not as the default one, these args will be |
| 205 # passed to the build. They are ignored when this is the default toolchain. | 205 # passed to the build. They are ignored when this is the default toolchain. |
| 206 toolchain_args() { | 206 toolchain_args() { |
| 207 current_cpu = invoker.toolchain_cpu | 207 current_cpu = invoker.toolchain_cpu |
| 208 current_os = invoker.toolchain_os | 208 current_os = invoker.toolchain_os |
| 209 | 209 |
| 210 # These values need to be passed through unchanged. | 210 # These values need to be passed through unchanged. |
| 211 target_os = target_os | 211 target_os = target_os |
| 212 target_cpu = target_cpu | 212 target_cpu = target_cpu |
| 213 | 213 |
| 214 # TODO(dpranke): These values are here for backwards compatibility and | |
| 215 # should be deleted when all of the builders and configs have been | |
| 216 # updated. | |
| 217 cpu_arch = current_cpu | |
| 218 os = current_os | |
| 219 | |
| 220 if (defined(invoker.is_clang)) { | 214 if (defined(invoker.is_clang)) { |
| 221 is_clang = invoker.is_clang | 215 is_clang = invoker.is_clang |
| 222 } | 216 } |
| 223 } | 217 } |
| 224 | 218 |
| 225 if (defined(invoker.deps)) { | 219 if (defined(invoker.deps)) { |
| 226 deps = invoker.deps | 220 deps = invoker.deps |
| 227 } | 221 } |
| 228 } | 222 } |
| 229 } | 223 } |
| OLD | NEW |