| 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 3115 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3126 '-Wstring-conversion', | 3126 '-Wstring-conversion', |
| 3127 | 3127 |
| 3128 # C++11-related flags: | 3128 # C++11-related flags: |
| 3129 | 3129 |
| 3130 # This warns on using ints as initializers for floats in | 3130 # This warns on using ints as initializers for floats in |
| 3131 # initializer lists (e.g. |int a = f(); CGSize s = { a, a };|), | 3131 # initializer lists (e.g. |int a = f(); CGSize s = { a, a };|), |
| 3132 # which happens in several places in chrome code. Not sure if | 3132 # which happens in several places in chrome code. Not sure if |
| 3133 # this is worth fixing. | 3133 # this is worth fixing. |
| 3134 '-Wno-c++11-narrowing', | 3134 '-Wno-c++11-narrowing', |
| 3135 | 3135 |
| 3136 # This warns about code like |"0x%08"NACL_PRIxPTR| -- with C++11 | 3136 # TODO(thakis): Remove, http://crbug.com/263960 |
| 3137 # user-defined literals, this is now a string literal with a UD | |
| 3138 # suffix. However, this is used heavily in NaCl code, so disable | |
| 3139 # the warning for now. | |
| 3140 '-Wno-reserved-user-defined-literal', | 3137 '-Wno-reserved-user-defined-literal', |
| 3141 | 3138 |
| 3142 # Clang considers the `register` keyword as deprecated, but e.g. | 3139 # Clang considers the `register` keyword as deprecated, but e.g. |
| 3143 # code generated by flex (used in angle) contains that keyword. | 3140 # code generated by flex (used in angle) contains that keyword. |
| 3144 # http://crbug.com/255186 | 3141 # http://crbug.com/255186 |
| 3145 '-Wno-deprecated-register', | 3142 '-Wno-deprecated-register', |
| 3146 ], | 3143 ], |
| 3147 'cflags!': [ | 3144 'cflags!': [ |
| 3148 # Clang doesn't seem to know know this flag. | 3145 # Clang doesn't seem to know know this flag. |
| 3149 '-mfpmath=sse', | 3146 '-mfpmath=sse', |
| (...skipping 673 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3823 'GCC_VERSION': 'com.apple.compilers.llvm.clang.1_0', | 3820 'GCC_VERSION': 'com.apple.compilers.llvm.clang.1_0', |
| 3824 'WARNING_CFLAGS': [ | 3821 'WARNING_CFLAGS': [ |
| 3825 '-Wheader-hygiene', | 3822 '-Wheader-hygiene', |
| 3826 | 3823 |
| 3827 # This warns on using ints as initializers for floats in | 3824 # This warns on using ints as initializers for floats in |
| 3828 # initializer lists (e.g. |int a = f(); CGSize s = { a, a };|), | 3825 # initializer lists (e.g. |int a = f(); CGSize s = { a, a };|), |
| 3829 # which happens in several places in chrome code. Not sure if | 3826 # which happens in several places in chrome code. Not sure if |
| 3830 # this is worth fixing. | 3827 # this is worth fixing. |
| 3831 '-Wno-c++11-narrowing', | 3828 '-Wno-c++11-narrowing', |
| 3832 | 3829 |
| 3833 # This warns about code like |"0x%08"NACL_PRIxPTR| -- with C++11 | 3830 # TODO(thakis): Remove, http://crbug.com/263960 |
| 3834 # user-defined literals, this is now a string literal with a UD | |
| 3835 # suffix. However, this is used heavily in NaCl code, so disable | |
| 3836 # the warning for now. | |
| 3837 '-Wno-reserved-user-defined-literal', | 3831 '-Wno-reserved-user-defined-literal', |
| 3838 | 3832 |
| 3839 # Don't die on dtoa code that uses a char as an array index. | 3833 # Don't die on dtoa code that uses a char as an array index. |
| 3840 # This is required solely for base/third_party/dmg_fp/dtoa.cc. | 3834 # This is required solely for base/third_party/dmg_fp/dtoa.cc. |
| 3841 '-Wno-char-subscripts', | 3835 '-Wno-char-subscripts', |
| 3842 | 3836 |
| 3843 # Clang spots more unused functions. | 3837 # Clang spots more unused functions. |
| 3844 '-Wno-unused-function', | 3838 '-Wno-unused-function', |
| 3845 | 3839 |
| 3846 # Warns on switches on enums that cover all enum values but | 3840 # Warns on switches on enums that cover all enum values but |
| (...skipping 287 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4134 '-Wheader-hygiene', | 4128 '-Wheader-hygiene', |
| 4135 # Don't die on dtoa code that uses a char as an array index. | 4129 # Don't die on dtoa code that uses a char as an array index. |
| 4136 # This is required solely for base/third_party/dmg_fp/dtoa.cc. | 4130 # This is required solely for base/third_party/dmg_fp/dtoa.cc. |
| 4137 '-Wno-char-subscripts', | 4131 '-Wno-char-subscripts', |
| 4138 # Clang spots more unused functions. | 4132 # Clang spots more unused functions. |
| 4139 '-Wno-unused-function', | 4133 '-Wno-unused-function', |
| 4140 # See comments on this flag higher up in this file. | 4134 # See comments on this flag higher up in this file. |
| 4141 '-Wno-unnamed-type-template-args', | 4135 '-Wno-unnamed-type-template-args', |
| 4142 # Match OS X clang C++11 warning settings. | 4136 # Match OS X clang C++11 warning settings. |
| 4143 '-Wno-c++11-narrowing', | 4137 '-Wno-c++11-narrowing', |
| 4138 # TODO(thakis): Remove, http://crbug.com/263960 |
| 4144 '-Wno-reserved-user-defined-literal', | 4139 '-Wno-reserved-user-defined-literal', |
| 4145 ], | 4140 ], |
| 4146 }, | 4141 }, |
| 4147 'target_conditions': [ | 4142 'target_conditions': [ |
| 4148 ['_toolset=="host"', { | 4143 ['_toolset=="host"', { |
| 4149 'xcode_settings': { | 4144 'xcode_settings': { |
| 4150 'SDKROOT': 'macosx<(mac_sdk)', # -isysroot | 4145 'SDKROOT': 'macosx<(mac_sdk)', # -isysroot |
| 4151 'MACOSX_DEPLOYMENT_TARGET': '<(mac_deployment_target)', | 4146 'MACOSX_DEPLOYMENT_TARGET': '<(mac_deployment_target)', |
| 4152 }, | 4147 }, |
| 4153 'conditions': [ | 4148 'conditions': [ |
| (...skipping 489 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4643 # settings in target dicts. SYMROOT is a special case, because many other | 4638 # settings in target dicts. SYMROOT is a special case, because many other |
| 4644 # Xcode variables depend on it, including variables such as | 4639 # Xcode variables depend on it, including variables such as |
| 4645 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 4640 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 4646 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 4641 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 4647 # files to appear (when present) in the UI as actual files and not red | 4642 # files to appear (when present) in the UI as actual files and not red |
| 4648 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 4643 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 4649 # and therefore SYMROOT, needs to be set at the project level. | 4644 # and therefore SYMROOT, needs to be set at the project level. |
| 4650 'SYMROOT': '<(DEPTH)/xcodebuild', | 4645 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 4651 }, | 4646 }, |
| 4652 } | 4647 } |
| OLD | NEW |