Chromium Code Reviews| 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 # TODO(brettw) Use "gcc_toolchain.gni" like the Linux toolchains. This requires | 5 # TODO(brettw) Use "gcc_toolchain.gni" like the Linux toolchains. This requires |
| 6 # some enhancements since the commands on Mac are slightly different than on | 6 # some enhancements since the commands on Mac are slightly different than on |
| 7 # Linux. | 7 # Linux. |
| 8 | 8 |
| 9 import("../goma.gni") | 9 import("../goma.gni") |
| 10 import("//build/config/ios/ios_sdk.gni") | 10 import("//build/config/ios/ios_sdk.gni") |
| (...skipping 213 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 224 # each toolchain because GN doesn't allow a template to be used here. | 224 # each toolchain because GN doesn't allow a template to be used here. |
| 225 # See //build/toolchain/toolchain.gni for details. | 225 # See //build/toolchain/toolchain.gni for details. |
| 226 tool("stamp") { | 226 tool("stamp") { |
| 227 command = stamp_command | 227 command = stamp_command |
| 228 description = stamp_description | 228 description = stamp_description |
| 229 } | 229 } |
| 230 tool("copy") { | 230 tool("copy") { |
| 231 command = copy_command | 231 command = copy_command |
| 232 description = copy_description | 232 description = copy_description |
| 233 } | 233 } |
| 234 tool("copy_bundle_data") { | |
| 235 command = "rm -rf {{output}} && ./gyp-mac-tool copy-bundle-resource {{sour ce}} {{output}} True" | |
|
sdefresne
2016/01/26 12:12:06
Removed the "rm -rf" (but the default "copy" tool
| |
| 236 description = "COPY_BUNDLE_DATA {{output}}" | |
| 237 } | |
| 234 | 238 |
| 235 toolchain_args() { | 239 toolchain_args() { |
| 236 current_cpu = invoker.toolchain_cpu | 240 current_cpu = invoker.toolchain_cpu |
| 237 current_os = invoker.toolchain_os | 241 current_os = invoker.toolchain_os |
| 238 | 242 |
| 239 # These values need to be passed through unchanged. | 243 # These values need to be passed through unchanged. |
| 240 host_toolchain = host_toolchain | 244 host_toolchain = host_toolchain |
| 241 target_os = target_os | 245 target_os = target_os |
| 242 target_cpu = target_cpu | 246 target_cpu = target_cpu |
| 243 | 247 |
| (...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 295 } | 299 } |
| 296 | 300 |
| 297 mac_toolchain("x64") { | 301 mac_toolchain("x64") { |
| 298 toolchain_cpu = "x64" | 302 toolchain_cpu = "x64" |
| 299 toolchain_os = "mac" | 303 toolchain_os = "mac" |
| 300 cc = "${goma_prefix}/gcc" | 304 cc = "${goma_prefix}/gcc" |
| 301 cxx = "${goma_prefix}/g++" | 305 cxx = "${goma_prefix}/g++" |
| 302 ld = cxx | 306 ld = cxx |
| 303 is_clang = false | 307 is_clang = false |
| 304 } | 308 } |
| OLD | NEW |