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/clang/clang.gni") | 10 import("//build/config/clang/clang.gni") |
| 11 import("//build/config/ios/ios_sdk.gni") | 11 if (is_ios) { |
| 12 import("//build/config/ios/ios_sdk.gni") | |
| 13 } | |
| 12 import("//build/config/mac/mac_sdk.gni") | 14 import("//build/config/mac/mac_sdk.gni") |
| 13 import("//build/config/mac/symbols.gni") | 15 import("//build/config/mac/symbols.gni") |
| 14 | 16 |
| 15 assert(host_os == "mac") | 17 assert(host_os == "mac") |
| 16 | 18 |
| 17 import("//build/toolchain/cc_wrapper.gni") | 19 import("//build/toolchain/cc_wrapper.gni") |
| 18 import("//build/toolchain/goma.gni") | 20 import("//build/toolchain/goma.gni") |
| 19 import("//build/toolchain/toolchain.gni") | 21 import("//build/toolchain/toolchain.gni") |
| 20 import("//build/toolchain/concurrent_links.gni") | 22 import("//build/toolchain/concurrent_links.gni") |
| 21 | 23 |
| (...skipping 371 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 393 mac_toolchain("clang_arm") { | 395 mac_toolchain("clang_arm") { |
| 394 toolchain_cpu = "arm" | 396 toolchain_cpu = "arm" |
| 395 toolchain_os = "mac" | 397 toolchain_os = "mac" |
| 396 } | 398 } |
| 397 | 399 |
| 398 mac_toolchain("clang_x64") { | 400 mac_toolchain("clang_x64") { |
| 399 toolchain_cpu = "x64" | 401 toolchain_cpu = "x64" |
| 400 toolchain_os = "mac" | 402 toolchain_os = "mac" |
| 401 } | 403 } |
| 402 | 404 |
| 403 mac_toolchain("ios_clang_arm") { | 405 if (is_ios) { |
|
sdefresne
2016/07/28 17:36:31
I don't think this is necessary, instead you could
justincohen
2016/07/28 17:59:40
Generating files...
ERROR at //build/toolchain/mac
Dirk Pranke
2016/07/28 19:07:20
That, plus it's probably better hygiene to not dec
| |
| 404 toolchain_cpu = "arm" | 406 mac_toolchain("ios_clang_arm") { |
| 405 toolchain_os = "ios" | 407 toolchain_cpu = "arm" |
| 408 toolchain_os = "ios" | |
| 409 } | |
| 410 | |
| 411 mac_toolchain("ios_clang_arm64") { | |
| 412 toolchain_cpu = "arm64" | |
| 413 toolchain_os = "ios" | |
| 414 } | |
| 415 | |
| 416 mac_toolchain("ios_clang_x86") { | |
| 417 toolchain_cpu = "x86" | |
| 418 toolchain_os = "ios" | |
| 419 } | |
| 420 | |
| 421 mac_toolchain("ios_clang_x64") { | |
| 422 toolchain_cpu = "x64" | |
| 423 toolchain_os = "ios" | |
| 424 } | |
| 406 } | 425 } |
| 407 | |
| 408 mac_toolchain("ios_clang_arm64") { | |
| 409 toolchain_cpu = "arm64" | |
| 410 toolchain_os = "ios" | |
| 411 } | |
| 412 | |
| 413 mac_toolchain("ios_clang_x86") { | |
| 414 toolchain_cpu = "x86" | |
| 415 toolchain_os = "ios" | |
| 416 } | |
| 417 | |
| 418 mac_toolchain("ios_clang_x64") { | |
| 419 toolchain_cpu = "x64" | |
| 420 toolchain_os = "ios" | |
| 421 } | |
| OLD | NEW |