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") |
| (...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 165 lib_switch = "-l" | 165 lib_switch = "-l" |
| 166 lib_dir_switch = "-L" | 166 lib_dir_switch = "-L" |
| 167 | 167 |
| 168 # Object files go in this directory. Use label_name instead of | 168 # Object files go in this directory. Use label_name instead of |
| 169 # target_output_name since labels will generally have no spaces and will be | 169 # target_output_name since labels will generally have no spaces and will be |
| 170 # unique in the directory. | 170 # unique in the directory. |
| 171 object_subdir = "{{target_out_dir}}/{{label_name}}" | 171 object_subdir = "{{target_out_dir}}/{{label_name}}" |
| 172 | 172 |
| 173 # If dSYMs are enabled, this flag will be added to the link tools. | 173 # If dSYMs are enabled, this flag will be added to the link tools. |
| 174 if (_enable_dsyms) { | 174 if (_enable_dsyms) { |
| 175 dsym_switch = " -Wcrl,dsym,{{root_out_dir}} " | 175 if (defined(invoker.dsym_name)) { |
|
themblsha
2017/03/17 15:50:58
This doesn't actually work, as it seems that I nee
Robert Sesek
2017/03/17 16:59:36
I think this is because tool()s are actually speci
| |
| 176 dsym_output_dir = | 176 dsym_name = invoker.dsym_name |
| 177 "{{root_out_dir}}/{{target_output_name}}{{output_extension}}.dSYM" | 177 } else { |
| 178 dsym_name = "{{target_output_name}}{{output_extension}}.dSYM" | |
| 179 } | |
| 180 dsym_switch = " -Wcrl,dsym,\{{root_out_dir}},\"$dsym_name\" " | |
| 181 dsym_output_dir = "{{root_out_dir}}/$dsym_name" | |
| 178 dsym_output = [ | 182 dsym_output = [ |
| 179 "$dsym_output_dir/", | 183 "$dsym_output_dir/", |
| 180 "$dsym_output_dir/Contents/Info.plist", | 184 "$dsym_output_dir/Contents/Info.plist", |
| 181 "$dsym_output_dir/Contents/Resources/DWARF/" + | 185 "$dsym_output_dir/Contents/Resources/DWARF/" + |
| 182 "{{target_output_name}}{{output_extension}}", | 186 "{{target_output_name}}{{output_extension}}", |
| 183 ] | 187 ] |
| 184 } else { | 188 } else { |
| 185 dsym_switch = "" | 189 dsym_switch = "" |
| 186 } | 190 } |
| 187 | 191 |
| (...skipping 333 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 521 } | 525 } |
| 522 } | 526 } |
| 523 | 527 |
| 524 mac_toolchain("ios_clang_x64") { | 528 mac_toolchain("ios_clang_x64") { |
| 525 toolchain_args = { | 529 toolchain_args = { |
| 526 current_cpu = "x64" | 530 current_cpu = "x64" |
| 527 current_os = "ios" | 531 current_os = "ios" |
| 528 } | 532 } |
| 529 } | 533 } |
| 530 } | 534 } |
| OLD | NEW |