| OLD | NEW |
| 1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2011 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 1821 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1832 # Clang spots more unused functions. | 1832 # Clang spots more unused functions. |
| 1833 '-Wno-unused-function', | 1833 '-Wno-unused-function', |
| 1834 # Don't die on dtoa code that uses a char as an array index. | 1834 # Don't die on dtoa code that uses a char as an array index. |
| 1835 '-Wno-char-subscripts', | 1835 '-Wno-char-subscripts', |
| 1836 # Especially needed for gtest macros using enum values from Mac | 1836 # Especially needed for gtest macros using enum values from Mac |
| 1837 # system headers. | 1837 # system headers. |
| 1838 # TODO(pkasting): In C++11 this is legal, so this should be | 1838 # TODO(pkasting): In C++11 this is legal, so this should be |
| 1839 # removed when we change to that. (This is also why we don't | 1839 # removed when we change to that. (This is also why we don't |
| 1840 # bother fixing all these cases today.) | 1840 # bother fixing all these cases today.) |
| 1841 '-Wno-unnamed-type-template-args', | 1841 '-Wno-unnamed-type-template-args', |
| 1842 # WebKit uses nullptr in a legit way, other that that this warning |
| 1843 # doesn't fire. |
| 1844 '-Wno-c++11-compat', |
| 1845 # This (rightyfully) complains about 'override', which we use |
| 1846 # heavily. |
| 1847 '-Wno-c++11-extensions', |
| 1842 ], | 1848 ], |
| 1843 'cflags!': [ | 1849 'cflags!': [ |
| 1844 # Clang doesn't seem to know know this flag. | 1850 # Clang doesn't seem to know know this flag. |
| 1845 '-mfpmath=sse', | 1851 '-mfpmath=sse', |
| 1846 ], | 1852 ], |
| 1847 }], | 1853 }], |
| 1848 ['clang==1 and clang_use_chrome_plugins==1', { | 1854 ['clang==1 and clang_use_chrome_plugins==1', { |
| 1849 'cflags': [ | 1855 'cflags': [ |
| 1850 '<(clang_chrome_plugins_flags)', | 1856 '<(clang_chrome_plugins_flags)', |
| 1851 ], | 1857 ], |
| (...skipping 325 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2177 | 2183 |
| 2178 # Don't use -Wc++0x-extensions, which Xcode 4 enables by default | 2184 # Don't use -Wc++0x-extensions, which Xcode 4 enables by default |
| 2179 # when buliding with clang. This warning is triggered when the | 2185 # when buliding with clang. This warning is triggered when the |
| 2180 # override keyword is used via the OVERRIDE macro from | 2186 # override keyword is used via the OVERRIDE macro from |
| 2181 # base/compiler_specific.h. | 2187 # base/compiler_specific.h. |
| 2182 'CLANG_WARN_CXX0X_EXTENSIONS': 'NO', | 2188 'CLANG_WARN_CXX0X_EXTENSIONS': 'NO', |
| 2183 | 2189 |
| 2184 'GCC_VERSION': 'com.apple.compilers.llvm.clang.1_0', | 2190 'GCC_VERSION': 'com.apple.compilers.llvm.clang.1_0', |
| 2185 'WARNING_CFLAGS': [ | 2191 'WARNING_CFLAGS': [ |
| 2186 '-Wheader-hygiene', | 2192 '-Wheader-hygiene', |
| 2187 | |
| 2188 # Don't die on dtoa code that uses a char as an array index. | 2193 # Don't die on dtoa code that uses a char as an array index. |
| 2189 # This is required solely for base/third_party/dmg_fp/dtoa.cc. | 2194 # This is required solely for base/third_party/dmg_fp/dtoa.cc. |
| 2190 '-Wno-char-subscripts', | 2195 '-Wno-char-subscripts', |
| 2191 | |
| 2192 # Clang spots more unused functions. | 2196 # Clang spots more unused functions. |
| 2193 '-Wno-unused-function', | 2197 '-Wno-unused-function', |
| 2194 | |
| 2195 # See comments on this flag higher up in this file. | 2198 # See comments on this flag higher up in this file. |
| 2196 '-Wno-unnamed-type-template-args', | 2199 '-Wno-unnamed-type-template-args', |
| 2200 # WebKit uses nullptr in a legit way, other that that this |
| 2201 # warning doesn't fire. |
| 2202 '-Wno-c++0x-compat', |
| 2203 # This (rightyfully) complains about 'override', which we use |
| 2204 # heavily. |
| 2205 '-Wno-c++11-extensions', |
| 2197 ], | 2206 ], |
| 2198 }], | 2207 }], |
| 2199 ['clang==1 and clang_use_chrome_plugins==1', { | 2208 ['clang==1 and clang_use_chrome_plugins==1', { |
| 2200 'OTHER_CFLAGS': [ | 2209 'OTHER_CFLAGS': [ |
| 2201 '<(clang_chrome_plugins_flags)', | 2210 '<(clang_chrome_plugins_flags)', |
| 2202 ], | 2211 ], |
| 2203 }], | 2212 }], |
| 2204 ['clang==1 and clang_load!="" and clang_add_plugin!=""', { | 2213 ['clang==1 and clang_load!="" and clang_add_plugin!=""', { |
| 2205 'OTHER_CFLAGS': [ | 2214 'OTHER_CFLAGS': [ |
| 2206 '-Xclang', '-load', '-Xclang', '<(clang_load)', | 2215 '-Xclang', '-load', '-Xclang', '<(clang_load)', |
| (...skipping 349 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2556 # settings in target dicts. SYMROOT is a special case, because many other | 2565 # settings in target dicts. SYMROOT is a special case, because many other |
| 2557 # Xcode variables depend on it, including variables such as | 2566 # Xcode variables depend on it, including variables such as |
| 2558 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 2567 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 2559 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 2568 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 2560 # files to appear (when present) in the UI as actual files and not red | 2569 # files to appear (when present) in the UI as actual files and not red |
| 2561 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 2570 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 2562 # and therefore SYMROOT, needs to be set at the project level. | 2571 # and therefore SYMROOT, needs to be set at the project level. |
| 2563 'SYMROOT': '<(DEPTH)/xcodebuild', | 2572 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 2564 }, | 2573 }, |
| 2565 } | 2574 } |
| OLD | NEW |