| OLD | NEW |
| 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 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 # IMPORTANT: | 5 # IMPORTANT: |
| 6 # Please don't directly include this file if you are building via gyp_chromium, | 6 # Please don't directly include this file if you are building via gyp_chromium, |
| 7 # since gyp_chromium is automatically forcing its inclusion. | 7 # since gyp_chromium is automatically forcing its inclusion. |
| 8 { | 8 { |
| 9 # Variables expected to be overriden on the GYP command line (-D) or by | 9 # Variables expected to be overriden on the GYP command line (-D) or by |
| 10 # ~/.gyp/include.gypi. | 10 # ~/.gyp/include.gypi. |
| (...skipping 6255 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6266 ], | 6266 ], |
| 6267 }, | 6267 }, |
| 6268 }], | 6268 }], |
| 6269 # TODO(pcc): Make these flags work correctly with CFI. | 6269 # TODO(pcc): Make these flags work correctly with CFI. |
| 6270 ['use_lto!=0 and cfi_vptr==0', { | 6270 ['use_lto!=0 and cfi_vptr==0', { |
| 6271 'target_defaults': { | 6271 'target_defaults': { |
| 6272 'target_conditions': [ | 6272 'target_conditions': [ |
| 6273 ['_toolset=="target"', { | 6273 ['_toolset=="target"', { |
| 6274 'cflags': [ | 6274 'cflags': [ |
| 6275 '-fwhole-program-vtables', | 6275 '-fwhole-program-vtables', |
| 6276 # TODO(pcc): Remove this flag once the upstream interface change | |
| 6277 # (http://reviews.llvm.org/D18635) lands. | |
| 6278 '-fwhole-program-vtables-blacklist=<(cfi_blacklist)', | |
| 6279 ], | 6276 ], |
| 6280 'ldflags': [ | 6277 'ldflags': [ |
| 6281 '-fwhole-program-vtables', | 6278 '-fwhole-program-vtables', |
| 6282 ], | 6279 ], |
| 6283 }], | 6280 }], |
| 6284 ], | 6281 ], |
| 6285 }, | 6282 }, |
| 6286 }], | 6283 }], |
| 6287 ], | 6284 ], |
| 6288 'xcode_settings': { | 6285 'xcode_settings': { |
| (...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6333 # settings in target dicts. SYMROOT is a special case, because many other | 6330 # settings in target dicts. SYMROOT is a special case, because many other |
| 6334 # Xcode variables depend on it, including variables such as | 6331 # Xcode variables depend on it, including variables such as |
| 6335 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 6332 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 6336 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 6333 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 6337 # files to appear (when present) in the UI as actual files and not red | 6334 # files to appear (when present) in the UI as actual files and not red |
| 6338 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 6335 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 6339 # and therefore SYMROOT, needs to be set at the project level. | 6336 # and therefore SYMROOT, needs to be set at the project level. |
| 6340 'SYMROOT': '<(DEPTH)/xcodebuild', | 6337 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 6341 }, | 6338 }, |
| 6342 } | 6339 } |
| OLD | NEW |