| 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 5680 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5691 # Building with Clang on Windows is a work in progress and very | 5691 # Building with Clang on Windows is a work in progress and very |
| 5692 # experimental. See crbug.com/82385. | 5692 # experimental. See crbug.com/82385. |
| 5693 # Keep this in sync with the similar blocks in build/config/compiler
/BUILD.gn | 5693 # Keep this in sync with the similar blocks in build/config/compiler
/BUILD.gn |
| 5694 ['clang==1', { | 5694 ['clang==1', { |
| 5695 'VCCLCompilerTool': { | 5695 'VCCLCompilerTool': { |
| 5696 'AdditionalOptions': [ | 5696 'AdditionalOptions': [ |
| 5697 # Many files use intrinsics without including this header. | 5697 # Many files use intrinsics without including this header. |
| 5698 # TODO(hans): Fix those files, or move this to sub-GYPs. | 5698 # TODO(hans): Fix those files, or move this to sub-GYPs. |
| 5699 '/FIIntrin.h', | 5699 '/FIIntrin.h', |
| 5700 | 5700 |
| 5701 # TODO(hans): Make this list shorter eventually. | 5701 # TODO(hans): Make this list shorter eventually, http://crbug.
com/504657 |
| 5702 '-Qunused-arguments', | 5702 '-Qunused-arguments', # http://crbug.com/504658 |
| 5703 '-Wno-c++11-compat-deprecated-writable-strings', | 5703 '-Wno-c++11-compat-deprecated-writable-strings', # http://crb
ug.com/504659 |
| 5704 '-Wno-deprecated-declarations', | 5704 '-Wno-deprecated-declarations', # http://crbug.com/504660 |
| 5705 '-Wno-empty-body', | 5705 '-Wno-empty-body', # http://crbug.com/504661 |
| 5706 '-Wno-enum-conversion', | 5706 '-Wno-enum-conversion', # http://crbug.com/504662 |
| 5707 '-Wno-extra-tokens', | 5707 '-Wno-extra-tokens', # http://crbug.com/504663 |
| 5708 '-Wno-ignored-attributes', | 5708 '-Wno-ignored-attributes', |
| 5709 '-Wno-incompatible-pointer-types', | 5709 '-Wno-incompatible-pointer-types', |
| 5710 '-Wno-int-to-void-pointer-cast', | 5710 '-Wno-int-to-void-pointer-cast', |
| 5711 '-Wno-invalid-noreturn', | 5711 '-Wno-invalid-noreturn', |
| 5712 '-Wno-logical-op-parentheses', | 5712 '-Wno-logical-op-parentheses', |
| 5713 '-Wno-microsoft', | 5713 '-Wno-microsoft', |
| 5714 '-Wno-missing-braces', | 5714 '-Wno-missing-braces', |
| 5715 '-Wno-missing-declarations', | 5715 '-Wno-missing-declarations', |
| 5716 '-Wno-msvc-include', | 5716 '-Wno-msvc-include', |
| 5717 '-Wno-null-dereference', | 5717 '-Wno-null-dereference', |
| 5718 '-Wno-overloaded-virtual', | 5718 '-Wno-overloaded-virtual', |
| 5719 '-Wno-parentheses', | 5719 '-Wno-parentheses', |
| 5720 '-Wno-pointer-sign', | 5720 '-Wno-pointer-sign', |
| 5721 '-Wno-reorder', | 5721 '-Wno-reorder', |
| 5722 '-Wno-return-type-c-linkage', | 5722 '-Wno-return-type-c-linkage', |
| 5723 '-Wno-self-assign', | 5723 '-Wno-self-assign', |
| 5724 '-Wno-sometimes-uninitialized', | 5724 '-Wno-sometimes-uninitialized', |
| 5725 '-Wno-switch', | 5725 '-Wno-switch', |
| 5726 '-Wno-tautological-compare', | 5726 '-Wno-tautological-compare', |
| 5727 '-Wno-unknown-pragmas', | 5727 '-Wno-unknown-pragmas', |
| 5728 '-Wno-unsequenced', | 5728 '-Wno-unsequenced', |
| 5729 '-Wno-unused-function', | 5729 '-Wno-unused-function', |
| 5730 '-Wno-unused-private-field', | 5730 '-Wno-unused-private-field', |
| 5731 '-Wno-unused-value', | 5731 '-Wno-unused-value', |
| 5732 '-Wno-unused-variable', | 5732 '-Wno-unused-variable', |
| 5733 '-Wno-unused-local-typedef', # http://crbug.com/411648 | 5733 '-Wno-unused-local-typedef', # http://crbug.com/411648 |
| 5734 '-Wno-inconsistent-missing-override', #http://crbug.com/428099 | 5734 '-Wno-inconsistent-missing-override', # http://crbug.com/4280
99 |
| 5735 ], | 5735 ], |
| 5736 }, | 5736 }, |
| 5737 }], | 5737 }], |
| 5738 ['clang==1 and target_arch=="ia32"', { | 5738 ['clang==1 and target_arch=="ia32"', { |
| 5739 'VCCLCompilerTool': { | 5739 'VCCLCompilerTool': { |
| 5740 'WarnAsError': 'false', | 5740 'WarnAsError': 'false', |
| 5741 'AdditionalOptions': [ | 5741 'AdditionalOptions': [ |
| 5742 '/fallback', | 5742 '/fallback', |
| 5743 ], | 5743 ], |
| 5744 }, | 5744 }, |
| (...skipping 456 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6201 # settings in target dicts. SYMROOT is a special case, because many other | 6201 # settings in target dicts. SYMROOT is a special case, because many other |
| 6202 # Xcode variables depend on it, including variables such as | 6202 # Xcode variables depend on it, including variables such as |
| 6203 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 6203 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 6204 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 6204 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 6205 # files to appear (when present) in the UI as actual files and not red | 6205 # files to appear (when present) in the UI as actual files and not red |
| 6206 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 6206 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 6207 # and therefore SYMROOT, needs to be set at the project level. | 6207 # and therefore SYMROOT, needs to be set at the project level. |
| 6208 'SYMROOT': '<(DEPTH)/xcodebuild', | 6208 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 6209 }, | 6209 }, |
| 6210 } | 6210 } |
| OLD | NEW |